diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c1a4b8bed1f..3a140b66b6f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,6 +6,7 @@ on: tags: - "*" pull_request: + merge_group: # Cancel in-progress runs in current workflow. concurrency: @@ -75,7 +76,7 @@ jobs: - uses: ory/ci/checkout@master with: fetch-depth: 2 - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: | internal/httpclient @@ -118,7 +119,7 @@ jobs: HSM_PIN: 1234 steps: - uses: ory/ci/checkout@master - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: | internal/httpclient @@ -177,11 +178,11 @@ jobs: - uses: actions/setup-go@v3 with: go-version: "1.22" - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: ./test/e2e/hydra key: ${{ runner.os }}-hydra - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: | internal/httpclient diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d0d8aa176c3..6eb4b109d07 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,6 +13,7 @@ on: branches: [master] schedule: - cron: "0 11 * * 6" + merge_group: jobs: analyze: diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 87e1655bce8..bdc2abec2a9 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -3,6 +3,7 @@ name: Format on: pull_request: push: + merge_group: jobs: format: