Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
tags:
- "*"
pull_request:
merge_group:

# Cancel in-progress runs in current workflow.
concurrency:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
branches: [master]
schedule:
- cron: "0 11 * * 6"
merge_group:

jobs:
analyze:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Format
on:
pull_request:
push:
merge_group:

jobs:
format:
Expand Down
Loading