Skip to content

Commit e3f93f5

Browse files
authored
Merge branch 'main' into tests/zero-downtime-upgrades
2 parents e0b5f2c + 7a6e198 commit e3f93f5

File tree

9 files changed

+22
-18
lines changed

9 files changed

+22
-18
lines changed

.github/labeler.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,18 @@ tech-debt:
1515

1616
documentation:
1717
- head-branch: ['^docs/', '^doc/']
18-
- changed-files: '**/*.md'
18+
- changed-files:
19+
- any-glob-to-any-file: '**/*.md'
1920

2021
dependencies:
2122
- head-branch: ['^deps/', '^dep/', '^dependabot/', 'pre-commit-ci-update-config']
22-
- changed-files: ['go.mod', 'go.sum']
23+
- changed-files:
24+
- any-glob-to-any-file: ['go.mod', 'go.sum']
2325

2426
tests:
25-
- head-branch: ['^test/', '^tests/']
27+
- head-branch: ['^tests/', '^test/']
2628

2729
helm-chart:
2830
- head-branch: ['^helm/', '^helm-chart/']
29-
- changed-files: ['deploy/helm-chart/**/*']
31+
- changed-files:
32+
- any-glob-to-any-file: ['deploy/helm-chart/**/*']

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Setup Golang Environment
3737
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
3838
with:
39-
go-version-file: go.mod
39+
go-version: stable
4040

4141
- name: Output Variables
4242
id: vars
@@ -65,7 +65,7 @@ jobs:
6565
- name: Setup Golang Environment
6666
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
6767
with:
68-
go-version-file: go.mod
68+
go-version: stable
6969

7070
- name: Run Tests
7171
run: make unit-test
@@ -107,7 +107,7 @@ jobs:
107107
- name: Setup Golang Environment
108108
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
109109
with:
110-
go-version-file: go.mod
110+
go-version: stable
111111

112112
- name: Create/Update Draft
113113
uses: lucacome/draft-release@785af55296512c907875513e397320ae3f1306bb # v1.0.1
@@ -322,7 +322,7 @@ jobs:
322322
ignore-unfixed: "true"
323323

324324
- name: Upload Trivy scan results to GitHub Security tab
325-
uses: github/codeql-action/upload-sarif@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
325+
uses: github/codeql-action/upload-sarif@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
326326
continue-on-error: true
327327
with:
328328
sarif_file: trivy-results-nginx-gateway-fabric${{ matrix.container == 'nginx' && '-nginx' || '' }}.sarif

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
47+
uses: github/codeql-action/init@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
4848
with:
4949
languages: ${{ matrix.language }}
5050
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -57,13 +57,13 @@ jobs:
5757
- name: Setup Golang Environment
5858
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
5959
with:
60-
go-version-file: go.mod
60+
go-version: stable
6161
if: matrix.language == 'go'
6262

6363
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
6464
# If this step fails, then you should remove it and run the build manually (see below)
6565
- name: Autobuild
66-
uses: github/codeql-action/autobuild@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
66+
uses: github/codeql-action/autobuild@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
6767

6868
# ℹ️ Command-line programs to run using the OS shell.
6969
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -76,6 +76,6 @@ jobs:
7676
# ./location_of_script_within_repo/buildscript.sh
7777

7878
- name: Perform CodeQL Analysis
79-
uses: github/codeql-action/analyze@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
79+
uses: github/codeql-action/analyze@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
8080
with:
8181
category: "/language:${{matrix.language}}"

.github/workflows/conformance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Setup Golang Environment
3939
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
4040
with:
41-
go-version-file: go.mod
41+
go-version: stable
4242

4343
- name: Set GOPATH
4444
run: echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV

.github/workflows/labeler.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
pull-requests: write
1313
runs-on: ubuntu-22.04
1414
steps:
15-
- uses: actions/labeler@4f052778de9a9b80cb16cfb9079b02287285a4cb # v5.0.0-alpha.1
15+
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
1616
with:
1717
repo-token: "${{ secrets.GITHUB_TOKEN }}"
18+
sync-labels: true

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup Golang Environment
2525
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2626
with:
27-
go-version-file: go.mod
27+
go-version: stable
2828

2929
- name: Lint Code
3030
uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.7.0

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ jobs:
6060

6161
# Upload the results to GitHub's code scanning dashboard.
6262
- name: "Upload to code-scanning"
63-
uses: github/codeql-action/upload-sarif@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
63+
uses: github/codeql-action/upload-sarif@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
6464
with:
6565
sarif_file: results.sarif

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
pull-requests: write # for actions/stale to close stale PRs
1414
runs-on: ubuntu-22.04
1515
steps:
16-
- uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8.0.0
16+
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
1717
with:
1818
repo-token: ${{ secrets.GITHUB_TOKEN }}
1919
stale-issue-message: "This issue is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 10 days."

.github/workflows/update-docker-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132
ignore-unfixed: "true"
133133

134134
- name: Upload Trivy scan results to GitHub Security tab
135-
uses: github/codeql-action/upload-sarif@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
135+
uses: github/codeql-action/upload-sarif@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
136136
continue-on-error: true
137137
with:
138138
sarif_file: trivy-results-nginx-gateway-fabric-nginx

0 commit comments

Comments
 (0)