diff --git a/.github/workflows/ci-all.yml b/.github/workflows/ci-all.yml index 0a1130276..c52c5bf3b 100644 --- a/.github/workflows/ci-all.yml +++ b/.github/workflows/ci-all.yml @@ -14,7 +14,6 @@ on: - "lib/**" - "script/**" - "!docs/**" - merge_group: env: CARGO_TERM_COLOR: always diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml index c42d8363e..8cdaa66a6 100644 --- a/.github/workflows/ci-lint.yml +++ b/.github/workflows/ci-lint.yml @@ -3,7 +3,8 @@ name: CI - Lint on: pull_request: types: [opened, reopened, edited, synchronize] - merge_group: + paths: + - "!docs/**" env: CARGO_TERM_COLOR: always diff --git a/.github/workflows/ci-provers.yml b/.github/workflows/ci-provers.yml index 16dd7cb1c..ca09162aa 100644 --- a/.github/workflows/ci-provers.yml +++ b/.github/workflows/ci-provers.yml @@ -7,11 +7,12 @@ on: paths: - "pipelines/**" - "harness/**" + - "!docs/**" pull_request: paths: - "pipelines/**" - "harness/**" - merge_group: + - "!docs/**" env: CARGO_TERM_COLOR: always diff --git a/.github/workflows/ci-risc0.yml b/.github/workflows/ci-risc0.yml index 3fd4cb08a..792707fa0 100644 --- a/.github/workflows/ci-risc0.yml +++ b/.github/workflows/ci-risc0.yml @@ -6,10 +6,11 @@ on: branches: ["main"] paths: - "provers/risc0/**" + - "!docs/**" pull_request: paths: - "provers/risc0/**" - merge_group: + - "!docs/**" jobs: build-test-risc0: diff --git a/.github/workflows/ci-sgx-all.yml b/.github/workflows/ci-sgx-all.yml index 9a020125c..d6879a8e2 100644 --- a/.github/workflows/ci-sgx-all.yml +++ b/.github/workflows/ci-sgx-all.yml @@ -6,10 +6,11 @@ on: branches: ["main"] paths: - "provers/sgx/**" + - "!docs/**" pull_request: paths: - "provers/sgx/**" - merge_group: + - "!docs/**" jobs: build-test-sgx: diff --git a/.github/workflows/ci-sgx-docker.yml b/.github/workflows/ci-sgx-docker.yml index 15335598f..9050bd3d3 100644 --- a/.github/workflows/ci-sgx-docker.yml +++ b/.github/workflows/ci-sgx-docker.yml @@ -6,10 +6,11 @@ on: branches: ["main"] paths: - "docker/**" + - "!docs/**" pull_request: paths: - "docker/**" - merge_group: + - "!docs/**" jobs: build-test-sgx-with-docker: diff --git a/.github/workflows/ci-sp1.yml b/.github/workflows/ci-sp1.yml index 1e7adbf66..127e8a088 100644 --- a/.github/workflows/ci-sp1.yml +++ b/.github/workflows/ci-sp1.yml @@ -6,10 +6,11 @@ on: branches: ["main"] paths: - "provers/sp1/**" + - "!docs/**" pull_request: paths: - "provers/sp1/**" - merge_group: + - "!docs/**" jobs: build-test-sp1: diff --git a/.github/workflows/openapi-deploy.yml b/.github/workflows/openapi-deploy.yml index 2e01cea6e..e1e57b187 100644 --- a/.github/workflows/openapi-deploy.yml +++ b/.github/workflows/openapi-deploy.yml @@ -3,10 +3,11 @@ name: OpenAPI on: push: branches: ["main"] - paths-ignore: - - "docs/**" + paths: + - "!docs/**" pull_request: - merge_group: + paths: + - "!docs/**" permissions: contents: read diff --git a/.github/workflows/repo--merge-gatekeeper.yml b/.github/workflows/repo--merge-gatekeeper.yml new file mode 100644 index 000000000..795a81aa7 --- /dev/null +++ b/.github/workflows/repo--merge-gatekeeper.yml @@ -0,0 +1,21 @@ +name: Merge Gatekeeper + +on: + pull_request: + branches: + - main + merge_group: # Trigger in merge queue to pass the required status check + +jobs: + merge-gatekeeper: + if: ${{ github.event_name == 'pull_request' && github.event.pull_request.draft == false }} + runs-on: [arc-runner-set] + permissions: + checks: read + statuses: read + steps: + - name: Run Merge Gatekeeper + uses: upsidr/merge-gatekeeper@v1 + with: + timeout: 1200 + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release-please.yml b/.github/workflows/repo--release-please.yml similarity index 100% rename from .github/workflows/release-please.yml rename to .github/workflows/repo--release-please.yml diff --git a/.github/workflows/typo-check.yml b/.github/workflows/repo--typo-check.yml similarity index 100% rename from .github/workflows/typo-check.yml rename to .github/workflows/repo--typo-check.yml diff --git a/.github/workflows/validate-pr-title.yml b/.github/workflows/repo--validate-pr-title.yml similarity index 100% rename from .github/workflows/validate-pr-title.yml rename to .github/workflows/repo--validate-pr-title.yml