Skip to content

Commit b3a892e

Browse files
authored
Merge branch 'ory:master' into master
2 parents 8075aba + 996bcaf commit b3a892e

File tree

8 files changed

+16
-77
lines changed

8 files changed

+16
-77
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,21 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: ory/ci/checkout@master
21-
- uses: actions/cache@v4
22-
with:
23-
path: internal/httpclient
24-
key: ${{ needs.sdk-generate.outputs.sdk-cache-key }}
2521
- uses: actions/setup-go@v6
2622
with:
2723
go-version: "1.25"
2824
- run: go list -json > go.list
2925
- name: Run nancy
3026
uses: sonatype-nexus-community/[email protected]
3127
- name: Run golangci-lint
28+
if: ${{ github.ref_type != 'tag' }}
3229
uses: golangci/golangci-lint-action@v8
3330
env:
3431
GOGC: 100
3532
with:
3633
args: --timeout 10m0s
3734
version: latest
35+
only-new-issues: "true"
3836
- name: Run go-acc (tests)
3937
run: |
4038
make .bin/go-acc
@@ -71,26 +69,13 @@ jobs:
7169
with:
7270
go-version: "1.25"
7371

74-
changelog:
75-
name: Generate changelog
76-
runs-on: ubuntu-latest
77-
if: ${{ github.ref_type == 'tag' || github.ref_name == 'master' }}
78-
needs:
79-
- test
80-
- validate
81-
steps:
82-
- uses: ory/ci/changelog@master
83-
with:
84-
token: ${{ secrets.ORY_BOT_PAT }}
85-
8672
release:
8773
name: Generate release
8874
runs-on: ubuntu-latest
8975
if: ${{ github.ref_type == 'tag' }}
9076
needs:
9177
- test
9278
- validate
93-
- changelog
9479
steps:
9580
- uses: ory/ci/releaser@master
9681
with:
@@ -100,18 +85,6 @@ jobs:
10085
docker_username: ${{ secrets.DOCKERHUB_USERNAME }}
10186
docker_password: ${{ secrets.DOCKERHUB_PASSWORD }}
10287

103-
render-version-schema:
104-
name: Render version schema
105-
runs-on: ubuntu-latest
106-
if: ${{ github.ref_type == 'tag' }}
107-
needs:
108-
- release
109-
steps:
110-
- uses: ory/ci/releaser/render-version-schema@master
111-
with:
112-
schema-path: .schema/config.schema.json
113-
token: ${{ secrets.ORY_BOT_PAT }}
114-
11588
newsletter-draft:
11689
name: Draft newsletter
11790
runs-on: ubuntu-latest

.github/workflows/closed_references.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
name: Find closed references
2121
steps:
2222
- uses: actions/checkout@v5
23-
- uses: actions/setup-node@v5
23+
- uses: actions/setup-node@v6
2424
with:
2525
node-version: "22"
2626
- uses: ory/closed-reference-notifier@v1

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444
# Initializes the CodeQL tools for scanning.
4545
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@v2
46+
uses: github/codeql-action/init@v4
4747
with:
4848
languages: ${{ matrix.language }}
4949
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
5454
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5555
# If this step fails, then you should remove it and run the build manually (see below)
5656
- name: Autobuild
57-
uses: github/codeql-action/autobuild@v2
57+
uses: github/codeql-action/autobuild@v4
5858

5959
# ℹ️ Command-line programs to run using the OS shell.
6060
# 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
6868
# make release
6969

7070
- name: Perform CodeQL Analysis
71-
uses: github/codeql-action/analyze@v2
71+
uses: github/codeql-action/analyze@v4

.github/workflows/conventional_commits.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
deps
4747
docs
4848
default_require_scope: false
49-
- uses: amannn/action-semantic-pull-request@v4
49+
- uses: amannn/action-semantic-pull-request@v6
5050
env:
5151
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5252
with:

.github/workflows/cve-scan.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ jobs:
6060

6161
- name: Configure Trivy
6262
run: |
63-
mkdir -p $HOME/.cache/trivy
64-
echo "TRIVY_USERNAME=${{ github.actor }}" >> $GITHUB_ENV
65-
echo "TRIVY_PASSWORD=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV
63+
mkdir -p "$HOME/.cache/trivy"
64+
echo "TRIVY_USERNAME=${{ github.actor }}" >> "$GITHUB_ENV"
65+
echo "TRIVY_PASSWORD=${{ secrets.GITHUB_TOKEN }}" >> "$GITHUB_ENV"
6666
6767
- name: Anchore Scanner
68-
uses: anchore/scan-action@v5
68+
uses: anchore/scan-action@v7
6969
id: grype-scan
7070
with:
7171
image: ${{ env.IMAGE_NAME }}
@@ -81,7 +81,7 @@ jobs:
8181
echo "::endgroup::"
8282
- name: Anchore upload scan SARIF report
8383
if: always()
84-
uses: github/codeql-action/upload-sarif@v3
84+
uses: github/codeql-action/upload-sarif@v4
8585
with:
8686
sarif_file: ${{ steps.grype-scan.outputs.sarif }}
8787
- name: Kubescape scanner

.github/workflows/licenses.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

.github/workflows/milestone.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2525
outputFile: docs/docs/milestones.md
2626
- name: Commit Milestone Documentation
27-
uses: EndBug/add-and-commit@v4.4.0
27+
uses: EndBug/add-and-commit@v9.1.4
2828
with:
2929
message: "autogen(docs): update milestone document"
3030
author_name: aeneasr

.github/workflows/pm.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ jobs:
1616
runs-on: ubuntu-latest
1717
timeout-minutes: 5
1818
steps:
19-
- uses: ory-corp/planning-automation-action@v0.1
19+
- uses: ory-corp/planning-automation-action@v0.2
2020
with:
2121
organization: ory-corp
2222
project: 5
2323
token: ${{ secrets.ORY_BOT_PAT }}
2424
todoLabel: "Needs Triage"
2525
statusName: Status
26-
statusValue: "Needs Triage"
26+
prStatusValue: "Needs Triage"
27+
issueStatusValue: "Needs Triage"
2728
includeEffort: "false"
2829
monthlyMilestoneName: Roadmap Monthly
2930
quarterlyMilestoneName: Roadmap

0 commit comments

Comments
 (0)