Skip to content

Commit 3ee6ff4

Browse files
authored
Merge pull request #291 from ory/master
[pull] master from ory:master
2 parents e715c8b + 5d2ca41 commit 3ee6ff4

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
tags:
77
- "*"
88
pull_request:
9+
merge_group:
910

1011
# Cancel in-progress runs in current workflow.
1112
concurrency:
@@ -75,7 +76,7 @@ jobs:
7576
- uses: ory/ci/checkout@master
7677
with:
7778
fetch-depth: 2
78-
- uses: actions/cache@v2
79+
- uses: actions/cache@v4
7980
with:
8081
path: |
8182
internal/httpclient
@@ -118,7 +119,7 @@ jobs:
118119
HSM_PIN: 1234
119120
steps:
120121
- uses: ory/ci/checkout@master
121-
- uses: actions/cache@v2
122+
- uses: actions/cache@v4
122123
with:
123124
path: |
124125
internal/httpclient
@@ -177,11 +178,11 @@ jobs:
177178
- uses: actions/setup-go@v3
178179
with:
179180
go-version: "1.22"
180-
- uses: actions/cache@v2
181+
- uses: actions/cache@v4
181182
with:
182183
path: ./test/e2e/hydra
183184
key: ${{ runner.os }}-hydra
184-
- uses: actions/cache@v2
185+
- uses: actions/cache@v4
185186
with:
186187
path: |
187188
internal/httpclient

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
branches: [master]
1414
schedule:
1515
- cron: "0 11 * * 6"
16+
merge_group:
1617

1718
jobs:
1819
analyze:

.github/workflows/format.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Format
33
on:
44
pull_request:
55
push:
6+
merge_group:
67

78
jobs:
89
format:

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
55
**Table of Contents**
66

7-
- [0.0.0 (2025-02-11)](#000-2025-02-11)
7+
- [0.0.0 (2025-02-19)](#000-2025-02-19)
88
- [Features](#features)
99
- [2.3.0 (2025-01-17)](#230-2025-01-17)
1010
- [Breaking Changes](#breaking-changes)
@@ -718,7 +718,7 @@
718718

719719
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
720720

721-
# [0.0.0](https://github.com/ory/hydra/compare/v2.3.0...v0.0.0) (2025-02-11)
721+
# [0.0.0](https://github.com/ory/hydra/compare/v2.3.0...v0.0.0) (2025-02-19)
722722

723723

724724
### Features

0 commit comments

Comments
 (0)