diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index ab7c823..43f0258 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -1,7 +1,6 @@ name: CICD env: - MIN_SUPPORTED_RUST_VERSION: "1.60.0" CICD_INTERMEDIATES_DIR: "_cicd-intermediates" on: @@ -32,10 +31,14 @@ jobs: steps: - name: Checkout source code uses: actions/checkout@v3 - - name: Install rust toolchain (v${{ env.MIN_SUPPORTED_RUST_VERSION }}) + + - name: Get the MSRV from the package metadata + id: msrv + run: cargo metadata --no-deps --format-version 1 | jq -r '"version=" + (.packages[] | select(.name = "bat").rust_version)' >> $GITHUB_OUTPUT + - name: Install rust toolchain (v${{ steps.msrv.outputs.version }}) uses: dtolnay/rust-toolchain@master with: - toolchain: ${{ env.MIN_SUPPORTED_RUST_VERSION }} + toolchain: ${{ steps.msrv.outputs.version }} components: clippy - name: Run clippy (on minimum supported rust version to prevent warnings we can't fix) run: cargo clippy --locked --all-targets ${{ env.MSRV_FEATURES }} @@ -60,6 +63,8 @@ jobs: - { target: x86_64-pc-windows-msvc , os: windows-2019 } - { target: x86_64-unknown-linux-gnu , os: ubuntu-20.04, use-cross: true } - { target: x86_64-unknown-linux-musl , os: ubuntu-20.04, use-cross: true } + env: + BUILD_CMD: cargo steps: - name: Checkout source code uses: actions/checkout@v3 diff --git a/Cargo.toml b/Cargo.toml index 4795089..dfe3264 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,6 +11,7 @@ version = "1.16.0" rust-version = "1.60.0" edition = "2018" build = "build.rs" +rust-version = "1.62" [features] # Use the nightly feature windows_process_extensions_main_thread_handle