diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index 7bd84eb21..817dcaa8f 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -108,8 +108,8 @@ jobs: # These names correspond to the files in ".ci/$distro$version" include: - distro: Arch - package: skip # We are packaged in Arch already - allow-failure: yes + package: false # We are packaged in Arch already + allow-failure: true - distro: Debian version: 11 @@ -118,13 +118,13 @@ jobs: - distro: Servatrice_Debian version: 11 package: DEB - test: skip - server_only: yes + test: false + server_only: true - distro: Debian version: 12 package: DEB - test: skip # Running tests on all distros is superfluous + test: false # Running tests on all distros is superfluous - distro: Debian version: 13 @@ -133,7 +133,7 @@ jobs: - distro: Fedora version: 42 package: RPM - test: skip # Running tests on all distros is superfluous + test: false # Running tests on all distros is superfluous - distro: Fedora version: 43 @@ -142,11 +142,12 @@ jobs: - distro: Ubuntu version: 22.04 package: DEB - test: skip # Running tests on all distros is superfluous + test: false # Running tests on all distros is superfluous - distro: Ubuntu version: 24.04 package: DEB + test: false # Running tests on all distros is superfluous - distro: Ubuntu version: 26.04 @@ -155,7 +156,7 @@ jobs: name: ${{matrix.distro}} ${{matrix.version}} needs: configure runs-on: ubuntu-latest - continue-on-error: ${{matrix.allow-failure == 'yes'}} + continue-on-error: ${{matrix.allow-failure == 'true'}} env: NAME: ${{matrix.distro}}${{matrix.version}} CACHE: ${{github.workspace}}/.cache/${{matrix.distro}}${{matrix.version}} # directory for caching docker image and ccache @@ -183,7 +184,7 @@ jobs: run: source .ci/docker.sh --build - name: Build debug and test - if: matrix.test != 'skip' + if: matrix.test != 'false' shell: bash env: CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}' @@ -193,14 +194,14 @@ jobs: - name: Build release package id: build - if: matrix.package != 'skip' + if: matrix.package != 'false' shell: bash env: BUILD_DIR: build SUFFIX: '-${{matrix.distro}}${{matrix.version}}' package: '${{matrix.package}}' CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}' - NO_CLIENT: ${{matrix.server_only == 'yes' && '--no-client' || '' }} + NO_CLIENT: ${{matrix.server_only == 'true' && '--no-client' || '' }} run: | source .ci/docker.sh RUN --server --release --package "$package" --dir "$BUILD_DIR" \ @@ -223,7 +224,7 @@ jobs: - name: Upload artifact id: upload_artifact - if: matrix.package != 'skip' + if: matrix.package != 'false' uses: actions/upload-artifact@v7 with: path: ${{steps.build.outputs.path}} @@ -232,7 +233,7 @@ jobs: - name: Upload to release id: upload_release - if: matrix.package != 'skip' && needs.configure.outputs.tag != null + if: matrix.package != 'false' && needs.configure.outputs.tag != null shell: bash env: GH_TOKEN: ${{github.token}}