diff --git a/.github/scripts/test-select-rust-ci-scope.sh b/.github/scripts/test-select-rust-ci-scope.sh index 4806be001..238a1684b 100755 --- a/.github/scripts/test-select-rust-ci-scope.sh +++ b/.github/scripts/test-select-rust-ci-scope.sh @@ -227,6 +227,8 @@ grep -Fq 'test-polymarket-market-recorder-release.sh' <<<"$recorder_block" grep -Fqx " if: always() && needs.scope.outputs.toolchain == 'true'" "$ci_workflow" ploy_workflow="$script_dir/../workflows/ploy-ci.yml" +grep -Fqx " group: prediction-markets-\${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}" "$ploy_workflow" +grep -Fqx " cancel-in-progress: \${{ github.ref != 'refs/heads/main' }}" "$ploy_workflow" [[ $(grep -Fxc ' branches: [main, develop]' "$ploy_workflow") -eq 2 ]] grep -Fqx ' needs: image-smoke-selector' "$ploy_workflow" grep -Fqx "$always_condition" "$ploy_workflow" diff --git a/.github/workflows/ploy-ci.yml b/.github/workflows/ploy-ci.yml index 624f21d72..1e242194b 100644 --- a/.github/workflows/ploy-ci.yml +++ b/.github/workflows/ploy-ci.yml @@ -16,8 +16,8 @@ on: workflow_dispatch: concurrency: - group: prediction-markets-${{ github.ref }} - cancel-in-progress: true + group: prediction-markets-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }} + cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} permissions: contents: read