diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ec2740be3..8f6d8259f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -79,10 +79,9 @@ jobs: - uses: actions/checkout@v6 with: persist-credentials: false - - uses: dtolnay/rust-toolchain@master + - uses: actions-rust-lang/setup-rust-toolchain@v1 with: components: cargo - toolchain: 1.95.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN - uses: baptiste0928/cargo-install@v3 with: crate: typos-cli @@ -100,10 +99,6 @@ jobs: image: quay.io/fedora/fedora:43 # CURRENT DEVELOPMENT ENVIRONMENT options: --privileged --userns=host --ipc=host -v /run/dbus/system_bus_socket:/run/dbus/system_bus_socket:ro -v /usr/share/dbus-1:/usr/share/dbus-1 steps: - - uses: dtolnay/rust-toolchain@master - with: - components: cargo - toolchain: 1.85.0 # LOWEST SUPPORTED RUST TOOLCHAIN - name: Install python prerequisites run: > dnf install -y @@ -141,12 +136,23 @@ jobs: python3-psutil python3-wcwidth systemd-devel + toml-cli - uses: stratis-storage/github-actions/github-modify@HEAD with: repo: stratisd - name: Print head commit run: git log --oneline -1 working-directory: stratisd + - name: Get package MSRV + id: msrv + run: | + MSRV=$(toml get --toml-path Cargo.toml "workspace.package.rust-version") + echo "MSRV=$MSRV" >> "$GITHUB_OUTPUT" + working-directory: stratisd + - uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + components: cargo + toolchain: ${{ steps.msrv.outputs.MSRV }} - name: Overwrite stratisd dependencies as necessary uses: stratis-storage/github-actions/stratisd-modify@HEAD with: @@ -200,16 +206,23 @@ jobs: python3-psutil python3-wcwidth systemd-devel - - uses: dtolnay/rust-toolchain@master - with: - components: cargo - toolchain: 1.85.0 # LOWEST SUPPORTED RUST TOOLCHAIN + toml-cli - uses: stratis-storage/github-actions/github-modify@HEAD with: repo: stratisd - name: Print head commit run: git log --oneline -1 working-directory: stratisd + - name: Get package MSRV + id: msrv + run: | + MSRV=$(toml get --toml-path Cargo.toml "workspace.package.rust-version") + echo "MSRV=$MSRV" >> "$GITHUB_OUTPUT" + working-directory: stratisd + - uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + components: cargo + toolchain: ${{ steps.msrv.outputs.MSRV }} - name: Overwrite stratisd dependencies as necessary uses: stratis-storage/github-actions/stratisd-modify@HEAD with: