on master help sign in
CICD: Build: Remove conditional TOOLCHAIN logic

because we always use "stable". If we need to go back to using matrix.job.toolchain, we should do it like in jobs.coverage, instead of messing about with vars and outputs.

commit63460f4bf94ea5a8706272faba507fd645d0d07d authorMartin Nordholts <enselic@gmail.com> dateWed 6 Jan 2021, 21:51 (6 years ago) parentc67b439
1 file changed+2−7
.github/workflows/CICD.yml+2−7
.github/workflows/CICD.yml+2−7
@@ -83,7 +83,7 @@ jobs:
8383 fail-fast: false
8484 matrix:
8585 job:
86− # { os, target, cargo-options, features, use-cross, toolchain }
86+ # { os, target, cargo-options, features, use-cross }
8787 - { os: ubuntu-latest , target: arm-unknown-linux-gnueabihf , use-cross: use-cross }
8888 - { os: ubuntu-18.04 , target: aarch64-unknown-linux-gnu , use-cross: use-cross }
8989 - { os: ubuntu-18.04 , target: i686-unknown-linux-gnu , use-cross: use-cross }
@@ -110,11 +110,6 @@ jobs:
110110 id: vars
111111 shell: bash
112112 run: |
113− # toolchain
114− TOOLCHAIN="stable" ## default to "stable" toolchain
115− # * use requested TOOLCHAIN if specified
116− if [ -n "${{ matrix.job.toolchain }}" ]; then TOOLCHAIN="${{ matrix.job.toolchain }}" ; fi
117− echo ::set-output name=TOOLCHAIN::${TOOLCHAIN}
118113 # staging directory
119114 STAGING='_staging'
120115 echo ::set-output name=STAGING::${STAGING}
@@ -194,7 +189,7 @@ jobs:
194189 - name: Install Rust toolchain
195190 uses: actions-rs/toolchain@v1
196191 with:
197− toolchain: ${{ steps.vars.outputs.TOOLCHAIN }}
192+ toolchain: stable
198193 target: ${{ matrix.job.target }}
199194 override: true
200195 profile: minimal # minimal component installation (ie, no documentation)