Archives/bat
2
0
Fork 0
mirror of https://github.com/sharkdp/bat synced 2024-11-04 18:00:24 +00:00
Code Issues Projects Releases Wiki Activity

CICD: Build: Use matrix.job.use-cross directly

Browse Source 
There is no need for a var and set-output detour.
This commit is contained in:
Martin Nordholts 2021-01-07 09:05:30 +01:00 committed by David Peter
parent 3ed83913b2
commit b6b7262962
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.github/workflows/CICD.yml vendored
View File

@ -84,12 +84,12 @@ jobs:
matrix: matrix:
job: job:
# { os, target, cargo-options, features, use-cross } # { os, target, cargo-options, features, use-cross }
- { os: ubuntu-latest , target: arm-unknown-linux-gnueabihf , use-cross: use-cross } - { os: ubuntu-latest , target: arm-unknown-linux-gnueabihf , use-cross: true }
- { os: ubuntu-18.04 , target: aarch64-unknown-linux-gnu , use-cross: use-cross } - { os: ubuntu-18.04 , target: aarch64-unknown-linux-gnu , use-cross: true }
- { os: ubuntu-18.04 , target: i686-unknown-linux-gnu , use-cross: use-cross } - { os: ubuntu-18.04 , target: i686-unknown-linux-gnu , use-cross: true }
- { os: ubuntu-18.04 , target: i686-unknown-linux-musl , use-cross: use-cross } - { 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 }
- { os: ubuntu-18.04 , target: x86_64-unknown-linux-musl , use-cross: use-cross } - { os: ubuntu-18.04 , target: x86_64-unknown-linux-musl , use-cross: true }
- { os: ubuntu-16.04 , target: x86_64-unknown-linux-gnu } - { os: ubuntu-16.04 , target: x86_64-unknown-linux-gnu }
- { os: macos-latest , target: x86_64-apple-darwin } - { os: macos-latest , target: x86_64-apple-darwin }
# - { os: windows-latest , target: i686-pc-windows-gnu } ## disabled; error: linker `i686-w64-mingw32-gcc` not found # - { os: windows-latest , target: i686-pc-windows-gnu } ## disabled; error: linker `i686-w64-mingw32-gcc` not found
@ -159,9 +159,6 @@ jobs:
if [[ -n $DPKG_ARCH && -n $DPKG_VERSION ]]; then DPKG_NAME="${DPKG_BASENAME}_${DPKG_VERSION}_${DPKG_ARCH}.deb" ; fi if [[ -n $DPKG_ARCH && -n $DPKG_VERSION ]]; then DPKG_NAME="${DPKG_BASENAME}_${DPKG_VERSION}_${DPKG_ARCH}.deb" ; fi
echo ::set-output name=DPKG_NAME::${DPKG_NAME} echo ::set-output name=DPKG_NAME::${DPKG_NAME}
# target-specific options # target-specific options
# * CARGO_USE_CROSS (truthy)
CARGO_USE_CROSS='true' ; case '${{ matrix.job.use-cross }}' in ''|0|f|false|n|no) unset CARGO_USE_CROSS ;; esac;
echo ::set-output name=CARGO_USE_CROSS::${CARGO_USE_CROSS}
# # * `arm` cannot be tested on ubuntu-* hosts (b/c testing is currently primarily done via comparison of target outputs with built-in outputs and the `arm` target is not executable on the host) # # * `arm` cannot be tested on ubuntu-* hosts (b/c testing is currently primarily done via comparison of target outputs with built-in outputs and the `arm` target is not executable on the host)
JOB_DO_TESTING="true" JOB_DO_TESTING="true"
case ${{ matrix.job.target }} in arm-*) unset JOB_DO_TESTING ;; esac; case ${{ matrix.job.target }} in arm-*) unset JOB_DO_TESTING ;; esac;
@ -199,49 +196,49 @@ jobs:
- name: Build - name: Build
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:
use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }} use-cross: ${{ matrix.job.use-cross }}
command: build command: build
args: --release --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} args: --release --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }}
- name: Test - name: Test
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:
use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }} use-cross: ${{ matrix.job.use-cross }}
command: test command: test
args: --target=${{ matrix.job.target }} ${{ steps.vars.outputs.CARGO_TEST_OPTIONS}} ${{ matrix.job.cargo-options }} args: --target=${{ matrix.job.target }} ${{ steps.vars.outputs.CARGO_TEST_OPTIONS}} ${{ matrix.job.cargo-options }}
- name: bat test run - name: bat test run
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:
use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }} use-cross: ${{ matrix.job.use-cross }}
command: run command: run
args: --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} -- --paging=never --color=always --theme=ansi Cargo.toml src/config.rs args: --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} -- --paging=never --color=always --theme=ansi Cargo.toml src/config.rs
- name: bat diagnostics output - name: bat diagnostics output
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:
use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }} use-cross: ${{ matrix.job.use-cross }}
command: run command: run
args: --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} -- --paging=never --color=always --theme=ansi Cargo.toml src/config.rs --diagnostic args: --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} -- --paging=never --color=always --theme=ansi Cargo.toml src/config.rs --diagnostic
- name: Check features regex-onig - name: Check features regex-onig
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:
use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }} use-cross: ${{ matrix.job.use-cross }}
command: check command: check
args: --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig args: --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig
- name: Check features regex-onig,git - name: Check features regex-onig,git
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:
use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }} use-cross: ${{ matrix.job.use-cross }}
command: check command: check
args: --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git args: --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git
- name: Check features regex-onig,paging - name: Check features regex-onig,paging
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:
use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }} use-cross: ${{ matrix.job.use-cross }}
command: check command: check
args: --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,paging args: --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,paging
- name: Check features regex-onig,git,paging - name: Check features regex-onig,git,paging
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:
use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }} use-cross: ${{ matrix.job.use-cross }}
command: check command: check
args: --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git,paging args: --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git,paging
- name: Upload build artifacts - name: Upload build artifacts