@@ -83,12 +83,11 @@ jobs:
83 fail-fast: false
83 fail-fast: false
86− # { os, target, cargo-options, features, use-cross }
87 - { os: ubuntu-latest , target: arm-unknown-linux-gnueabihf , use-cross: true }
86 - { os: ubuntu-latest , target: arm-unknown-linux-gnueabihf , use-cross: true }
88 - { os: ubuntu-18.04 , target: aarch64-unknown-linux-gnu , use-cross: true }
87 - { os: ubuntu-18.04 , target: aarch64-unknown-linux-gnu , use-cross: true }
89 - { os: ubuntu-18.04 , target: i686-unknown-linux-gnu , use-cross: true }
88 - { os: ubuntu-18.04 , target: i686-unknown-linux-gnu , use-cross: true }
90 - { os: ubuntu-18.04 , target: i686-unknown-linux-musl , use-cross: true }
89 - { 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
92 - { os: ubuntu-18.04 , target: x86_64-unknown-linux-musl , use-cross: true }
91 - { os: ubuntu-18.04 , target: x86_64-unknown-linux-musl , use-cross: true }
93 - { os: ubuntu-16.04 , target: x86_64-unknown-linux-gnu }
92 - { os: ubuntu-16.04 , target: x86_64-unknown-linux-gnu }
94 - { os: macos-latest , target: x86_64-apple-darwin }
93 - { os: macos-latest , target: x86_64-apple-darwin }
@@ -127,8 +126,6 @@ jobs:
127 echo ::set-output name=PKG_NAME::${PKG_NAME}
126 echo ::set-output name=PKG_NAME::${PKG_NAME}
128 # deployable tag? (ie, leading "vM" or "M"; M == version number)
127 # deployable tag? (ie, leading "vM" or "M"; M == version number)
129 unset DEPLOY ; if [[ $REF_TAG =~ ^[vV]?[0-9].* ]]; then DEPLOY='true' ; fi
128 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
132 echo ::set-output name=DEPLOY::${DEPLOY}
129 echo ::set-output name=DEPLOY::${DEPLOY}
133 # DPKG architecture?
130 # DPKG architecture?
134 unset DPKG_ARCH
131 unset DPKG_ARCH
@@ -350,7 +347,7 @@ jobs:
351 - name: Publish archives and packages
348 - name: Publish archives and packages
352 uses: softprops/action-gh-release@v1
349 uses: softprops/action-gh-release@v1
353− if: steps.vars.outputs.DEPLOY
350+ if: steps.vars.outputs.DEPLOY && !matrix.job.disable-deploy
356 ${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_NAME }}
353 ${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_NAME }}