diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index 262a8c3bf..30de77fac 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -190,12 +190,14 @@ jobs: unset CARGO_FEATURES_OPTION if [ -n "${{ matrix.job.features }}" ]; then CARGO_FEATURES_OPTION='--features "${{ matrix.job.features }}"' ; fi outputs CARGO_FEATURES_OPTION - - name: Confirm MinSRV compatible 'Cargo.lock' + - name: Confirm MinSRV compatible '*/Cargo.lock' shell: bash run: | - ## Confirm MinSRV compatible 'Cargo.lock' - # * 'Cargo.lock' is required to be in a format that `cargo` of MinSRV can interpret (eg, v1-format for MinSRV < v1.38) - cargo fetch --locked --quiet || { echo "::error file=Cargo.lock::Incompatible (or out-of-date) 'Cargo.lock' file; update using \`cargo +${{ env.RUST_MIN_SRV }} update\`" ; exit 1 ; } + ## Confirm MinSRV compatible '*/Cargo.lock' + # * '*/Cargo.lock' is required to be in a format that `cargo` of MinSRV can interpret (eg, v1-format for MinSRV < v1.38) + for dir in "." "fuzz"; do + ( cd "$dir" && cargo fetch --locked --quiet ) || { echo "::error file=$dir/Cargo.lock::Incompatible (or out-of-date) '$dir/Cargo.lock' file; update using \`cd '$dir' && cargo +${{ env.RUST_MIN_SRV }} update\`" ; exit 1 ; } + done - name: Install/setup prerequisites shell: bash run: | @@ -246,7 +248,9 @@ jobs: run: | ## `cargo update` testing # * convert any errors/warnings to GHA UI annotations; ref: - cargo fetch --locked --quiet || { echo "::error file=Cargo.lock::'Cargo.lock' file requires update (use \`cargo +${{ env.RUST_MIN_SRV }} update\`)" ; exit 1 ; } + for dir in "." "fuzz"; do + ( cd "$dir" && cargo fetch --locked --quiet ) || { echo "::error file=$dir/Cargo.lock::'$dir/Cargo.lock' file requires update (use \`cd '$dir' && cargo +${{ env.RUST_MIN_SRV }} update\`)" ; exit 1 ; } + done build_makefile: name: Build/Makefile diff --git a/.github/workflows/FixPR.yml b/.github/workflows/FixPR.yml index fe5f51946..bbdf50b30 100644 --- a/.github/workflows/FixPR.yml +++ b/.github/workflows/FixPR.yml @@ -43,9 +43,11 @@ jobs: - name: Ensure updated 'Cargo.lock' shell: bash run: | - # Ensure updated 'Cargo.lock' - # * 'Cargo.lock' is required to be in a format that `cargo` of MinSRV can interpret (eg, v1-format for MinSRV < v1.38) - cargo fetch --locked --quiet || cargo +${{ steps.vars.outputs.RUST_MIN_SRV }} update + # Ensure updated '*/Cargo.lock' + # * '*/Cargo.lock' is required to be in a format that `cargo` of MinSRV can interpret (eg, v1-format for MinSRV < v1.38) + for dir in "." "fuzz"; do + ( cd "$dir" && (cargo fetch --locked --quiet || cargo +${{ steps.vars.outputs.RUST_MIN_SRV }} update) ) + done - name: Info shell: bash run: | @@ -71,8 +73,8 @@ jobs: with: new_branch: ${{ env.BRANCH_TARGET }} default_author: github_actions - message: "maint ~ refresh 'Cargo.lock'" - add: Cargo.lock + message: "maint ~ refresh 'Cargo.lock' 'fuzz/Cargo.lock'" + add: Cargo.lock fuzz/Cargo.lock env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}