From f896834c77d1bb3238fe29287607072903da6430 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 7 Mar 2022 21:25:58 +0100 Subject: [PATCH 1/5] Use min rust version as default --- .github/workflows/CICD.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index dd83c66df..2c4a428eb 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -636,7 +636,7 @@ jobs: # # https://github.com/rust-lang/rustup/issues/2229#issuecomment-585855925 # RUSTUP_UNPACK_RAM: "21474836480" with: - toolchain: ${{ steps.vars.outputs.TOOLCHAIN }} + toolchain: ${{ env.RUST_MIN_SRV }} target: ${{ matrix.job.target }} default: true profile: minimal # minimal component installation (ie, no documentation) @@ -688,18 +688,21 @@ jobs: use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }} command: build args: --release --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} + toolchain: ${{ env.RUST_MIN_SRV }} - name: Test uses: actions-rs/cargo@v1 with: use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }} command: test args: --target=${{ matrix.job.target }} ${{ steps.vars.outputs.CARGO_TEST_OPTIONS}} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} + toolchain: ${{ env.RUST_MIN_SRV }} - name: Test individual utilities uses: actions-rs/cargo@v1 with: use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }} command: test args: --target=${{ matrix.job.target }} ${{ steps.vars.outputs.CARGO_TEST_OPTIONS}} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} ${{ steps.dep_vars.outputs.CARGO_UTILITY_LIST_OPTIONS }} + toolchain: ${{ env.RUST_MIN_SRV }} - name: Archive executable artifacts uses: actions/upload-artifact@v2 with: From e3649e33c51bed00121ae24afa783e3c59f23083 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 7 Mar 2022 21:43:42 +0100 Subject: [PATCH 2/5] remove old comment --- .github/workflows/CICD.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index 2c4a428eb..f9273f6c9 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -631,10 +631,6 @@ jobs: esac - name: rust toolchain ~ install uses: actions-rs/toolchain@v1 - # env: - # # Override auto-detection of RAM for Rustc install. - # # https://github.com/rust-lang/rustup/issues/2229#issuecomment-585855925 - # RUSTUP_UNPACK_RAM: "21474836480" with: toolchain: ${{ env.RUST_MIN_SRV }} target: ${{ matrix.job.target }} From 2a48234c12497e9095f36082d855c42cb9e15064 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 7 Mar 2022 21:48:15 +0100 Subject: [PATCH 3/5] add a job to build with rust stable --- .github/workflows/CICD.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index f9273f6c9..6c98ae1ac 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -433,6 +433,32 @@ jobs: make test + build_rust_stable: + name: Build/stable + needs: [ min_version, deps ] + runs-on: ${{ matrix.job.os }} + strategy: + fail-fast: false + matrix: + job: + - { os: ubuntu-latest , features: feat_os_unix } + - { os: macos-latest , features: feat_os_macos } + - { os: windows-latest , features: feat_os_windows } + steps: + - uses: actions/checkout@v2 + - uses: Swatinem/rust-cache@v1 + - name: Install `rust` toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + default: true + profile: minimal # minimal component installation (ie, no documentation) + - name: Test + uses: actions-rs/cargo@v1 + with: + command: test + args: ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} + compute_size: name: Binary sizes needs: [ min_version, deps ] From 9f5fad1e3847c0bead91fcdbc8ca6636a95fe935 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 7 Mar 2022 21:48:42 +0100 Subject: [PATCH 4/5] add a job to build with rust nightly --- .github/workflows/CICD.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index 6c98ae1ac..361a8c48b 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -459,6 +459,32 @@ jobs: command: test args: ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} + build_rust_nightly: + name: Build/nightly + needs: [ min_version, deps ] + runs-on: ${{ matrix.job.os }} + strategy: + fail-fast: false + matrix: + job: + - { os: ubuntu-latest , features: feat_os_unix } + - { os: macos-latest , features: feat_os_macos } + - { os: windows-latest , features: feat_os_windows } + steps: + - uses: actions/checkout@v2 + - uses: Swatinem/rust-cache@v1 + - name: Install `rust` toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: nightly + default: true + profile: minimal # minimal component installation (ie, no documentation) + - name: Test + uses: actions-rs/cargo@v1 + with: + command: test + args: ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} + compute_size: name: Binary sizes needs: [ min_version, deps ] From a22709aedd8478d58169db565bc746b70fe19236 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 8 Mar 2022 22:07:16 +0100 Subject: [PATCH 5/5] CI: Disable Windows job i686-pc-windows-gnu Fails with: error: linker `i686-w64-mingw32-gcc` not found And the Windows GNU is covered by x86_64-pc-windows-gnu anyway --- .github/workflows/CICD.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index 361a8c48b..ecb1d8d6f 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -557,7 +557,6 @@ jobs: #- { os: ubuntu-18.04 , target: x86_64-unknown-linux-gnu , features: feat_os_unix , use-cross: use-cross } #- { os: ubuntu-18.04 , target: x86_64-unknown-linux-musl , features: feat_os_unix_musl , use-cross: use-cross } - { os: macos-latest , target: x86_64-apple-darwin , features: feat_os_macos } - - { os: windows-latest , target: i686-pc-windows-gnu , features: feat_os_windows } - { os: windows-latest , target: i686-pc-windows-msvc , features: feat_os_windows } - { os: windows-latest , target: x86_64-pc-windows-gnu , features: feat_os_windows } ## note: requires rust >= 1.43.0 to link correctly - { os: windows-latest , target: x86_64-pc-windows-msvc , features: feat_os_windows }