diff --git a/.github/workflows/merge-bot.yml b/.github/workflows/merge-bot.yml index 2fdfe42..63c1266 100644 --- a/.github/workflows/merge-bot.yml +++ b/.github/workflows/merge-bot.yml @@ -141,12 +141,18 @@ jobs: # aggregate check reports neutral while results are still being # processed) mean "not settled yet": retry. Anything else that is # not success is a hard fail. Timeout fails closed. + py_changed=$(gh api "repos/$GITHUB_REPOSITORY/pulls/${{ github.event.pull_request.number }}/files" --paginate --jq '.[].filename' | grep -cE '\.py$' || true) + echo "python files changed in PR: $py_changed" for i in $(seq 1 20); do ok=1 for name in "CodeQL" "Analyze (actions)" "Analyze (python)" "policy-ci"; do c=$(gh api "repos/$GITHUB_REPOSITORY/commits/$HEAD_SHA/check-runs?per_page=100" \ --jq "[.check_runs[] | select(.name == \"$name\")] | sort_by(.started_at) | last | if . == null or .status != \"completed\" then \"none\" else .conclusion // \"none\" end") echo "attempt $i: $name: $c" + if [ "$name" = "Analyze (python)" ] && [ "$py_changed" = "0" ] && [ "$c" = "none" ]; then + echo " no .py files changed, python analysis was not scheduled: not required" + continue + fi case "$c" in success) ;; none|null|neutral) ok=0 ;; diff --git a/environments/alpine-3.24-musl/Containerfile b/environments/alpine-3.24-musl/Containerfile index 553a9bb..196e9e5 100644 --- a/environments/alpine-3.24-musl/Containerfile +++ b/environments/alpine-3.24-musl/Containerfile @@ -63,7 +63,7 @@ ENV PROTOC=/usr/bin/protoc \ ARG RUSTUP_VERSION=1.29.1 ARG RUSTUP_SHA256_X86_64=331228566cc931f32cd684f9bebc5956a5e5d7394c8d5de595f196a658ab98e6 ARG RUSTUP_SHA256_AARCH64=1ddf36182ac5d1782dbeefcb9bea7f5f9412d88f4a0d5047b1564a223624e8c6 -ARG RUST_VERSION=1.98.1 +ARG RUST_VERSION=1.96.1 ENV RUSTUP_HOME=/opt/rustup \ CARGO_HOME=/opt/cargo \