diff options
| author | Wu Xiaotian <[email protected]> | 2025-05-19 23:08:31 +0800 |
|---|---|---|
| committer | Xiaotian Wu <[email protected]> | 2025-05-20 09:47:17 +0800 |
| commit | 0ba0e897fdc93b48a94c8227c3139a100c814f42 (patch) | |
| tree | 52e86e2d653d963e9625bfe9793ab826552025f6 | |
| parent | 7168996e0e32d421ef65c2fa598f78076b410a52 (diff) | |
| download | mate-polkit-0ba0e897fdc93b48a94c8227c3139a100c814f42.tar.bz2 mate-polkit-0ba0e897fdc93b48a94c8227c3139a100c814f42.tar.xz | |
CI: meson and autotools use two jobs.
| -rwxr-xr-x | .github/workflows/builds.sh | 4 | ||||
| -rw-r--r-- | .github/workflows/builds.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/.github/workflows/builds.sh b/.github/workflows/builds.sh index 24759fc..c80e76a 100755 --- a/.github/workflows/builds.sh +++ b/.github/workflows/builds.sh @@ -16,7 +16,7 @@ infoend() { # Run meson first, then run autotools # Because meson dist requires a clean git workspace # Autotools will modify some files (such as po, etc.), making them dirty. -if [ -f meson.build ]; then +if [[ -f meson.build && $1 == "meson" ]]; then infobegin "Configure (meson)" meson setup _build --prefix=/usr @@ -39,7 +39,7 @@ if [ -f meson.build ]; then infoend fi -if [ -f autogen.sh ]; then +if [[ -f autogen.sh && $1 == "autotools" ]]; then infobegin "Configure (autotools)" NOCONFIGURE=1 ./autogen.sh ./configure --prefix=/usr --enable-compile-warnings=maximum || { diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 65d7e2e..a76f66c 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -16,7 +16,7 @@ concurrency: jobs: build: - name: Build on ${{matrix.container}} (using ${{matrix.cc}}) + name: ${{matrix.container}} (${{matrix.cc}} ${{matrix.build-system}}) runs-on: ubuntu-latest container: image: ${{matrix.container}} @@ -36,8 +36,14 @@ jobs: ] cc: ["gcc"] cxx: ["g++"] + build-system: ["autotools", "meson"] include: - container: "archlinux:latest" + build-system: "autotools" + cc: "clang" + cxx: "clang++" + - container: "archlinux:latest" + build-system: "meson" cc: "clang" cxx: "clang++" @@ -76,4 +82,4 @@ jobs: key: ${{ env.DISTRO }}-${{ matrix.cc }} - name: Build the source code - run: .github/workflows/builds.sh + run: .github/workflows/builds.sh ${{ matrix.build-system }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e5c2055..fdc5345 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: run: sudo .github/workflows/ubuntu.sh - name: Build the source code - run: .github/workflows/builds.sh + run: .github/workflows/builds.sh meson - name: Install GH CLI uses: dev-hanz-ops/[email protected] |