diff options
| author | Martin Nordholts <enselic@gmail.com> | 2021-01-07 11:39:26 +0100 |
|---|---|---|
| committer | David Peter <sharkdp@users.noreply.github.com> | 2021-01-09 08:30:54 +0100 |
| commit | 59f9adc70610a7a30f5c267f2f8f7816e21b1f09 (patch) | |
| tree | 5d7796b99aafee4a14be0eaf189ede4f759978e1 /.github | |
| parent | fed30b1b36e4197beafceb09da1d6273fb0c30a6 (diff) | |
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
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/CICD.yml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index a224d121..4847badf 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -83,12 +83,11 @@ jobs: fail-fast: false matrix: job: - # { os, target, cargo-options, features, use-cross } - { os: ubuntu-latest , target: arm-unknown-linux-gnueabihf , use-cross: true } - { os: ubuntu-18.04 , target: aarch64-unknown-linux-gnu , use-cross: true } - { os: ubuntu-18.04 , target: i686-unknown-linux-gnu , use-cross: true } - { os: ubuntu-18.04 , target: i686-unknown-linux-musl , use-cross: true } - - { os: ubuntu-18.04 , target: x86_64-unknown-linux-gnu } + - { os: ubuntu-18.04 , target: x86_64-unknown-linux-gnu , disable-deploy: true } ## deployed from ubuntu-16.04 - { os: ubuntu-18.04 , target: x86_64-unknown-linux-musl , use-cross: true } - { os: ubuntu-16.04 , target: x86_64-unknown-linux-gnu } - { os: macos-latest , target: x86_64-apple-darwin } @@ -127,8 +126,6 @@ jobs: echo ::set-output name=PKG_NAME::${PKG_NAME} # deployable tag? (ie, leading "vM" or "M"; M == version number) unset DEPLOY ; if [[ $REF_TAG =~ ^[vV]?[0-9].* ]]; then DEPLOY='true' ; fi - # unset deploy on ubuntu-18.04 x64 - we will deploy the tarball/deb built on ubuntu-16.04 x64 - if [ "${{ matrix.job.os }}" = "ubuntu-18.04" ] && [ "${{ matrix.job.target }}" = "x86_64-unknown-linux-gnu" ]; then unset DEPLOY; fi echo ::set-output name=DEPLOY::${DEPLOY} # DPKG architecture? unset DPKG_ARCH @@ -350,7 +347,7 @@ jobs: fi - name: Publish archives and packages uses: softprops/action-gh-release@v1 - if: steps.vars.outputs.DEPLOY + if: steps.vars.outputs.DEPLOY && !matrix.job.disable-deploy with: files: | ${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_NAME }} |