on master help sign in
CICD: Build: Add and use disable-deploy matrix var

This results in a nicer workflow file that is easier to follow. Also remove the unneccesary doc row that repeats what is already in the matrix and that is annoying to keep up to date. For #1474

commit59f9adc70610a7a30f5c267f2f8f7816e21b1f09 authorMartin Nordholts <enselic@gmail.com> dateThu 7 Jan 2021, 11:39 (6 years ago) parentfed30b1
1 file changed+2−5
.github/workflows/CICD.yml+2−5
.github/workflows/CICD.yml+2−5
@@ -83,12 +83,11 @@ jobs:
8383 fail-fast: false
8484 matrix:
8585 job:
86− # { os, target, cargo-options, features, use-cross }
8786 - { os: ubuntu-latest , target: arm-unknown-linux-gnueabihf , use-cross: true }
8887 - { os: ubuntu-18.04 , target: aarch64-unknown-linux-gnu , use-cross: true }
8988 - { os: ubuntu-18.04 , target: i686-unknown-linux-gnu , use-cross: true }
9089 - { os: ubuntu-18.04 , target: i686-unknown-linux-musl , use-cross: true }
91− - { os: ubuntu-18.04 , target: x86_64-unknown-linux-gnu }
90+ - { os: ubuntu-18.04 , target: x86_64-unknown-linux-gnu , disable-deploy: true } ## deployed from ubuntu-16.04
9291 - { os: ubuntu-18.04 , target: x86_64-unknown-linux-musl , use-cross: true }
9392 - { os: ubuntu-16.04 , target: x86_64-unknown-linux-gnu }
9493 - { os: macos-latest , target: x86_64-apple-darwin }
@@ -127,8 +126,6 @@ jobs:
127126 echo ::set-output name=PKG_NAME::${PKG_NAME}
128127 # deployable tag? (ie, leading "vM" or "M"; M == version number)
129128 unset DEPLOY ; if [[ $REF_TAG =~ ^[vV]?[0-9].* ]]; then DEPLOY='true' ; fi
130− # unset deploy on ubuntu-18.04 x64 - we will deploy the tarball/deb built on ubuntu-16.04 x64
131− if [ "${{ matrix.job.os }}" = "ubuntu-18.04" ] && [ "${{ matrix.job.target }}" = "x86_64-unknown-linux-gnu" ]; then unset DEPLOY; fi
132129 echo ::set-output name=DEPLOY::${DEPLOY}
133130 # DPKG architecture?
134131 unset DPKG_ARCH
@@ -350,7 +347,7 @@ jobs:
350347 fi
351348 - name: Publish archives and packages
352349 uses: softprops/action-gh-release@v1
353− if: steps.vars.outputs.DEPLOY
350+ if: steps.vars.outputs.DEPLOY && !matrix.job.disable-deploy
354351 with:
355352 files: |
356353 ${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_NAME }}