chore: update actions-cache to v4 (#3948)

ory · Feb 19, 2025 · 66c66ab · 66c66ab
1 parent 96d4ffe
commit 66c66ab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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
@@ -3,6 +3,7 @@ name: Format
 on:
   pull_request:
   push:
+  merge_group:
 
 jobs:
   format:
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ name: Format @@
     on:
       pull_request:
       push:
+      merge_group:
     jobs:
       format:
@@ Expand Down @@