Skip to content

Commit cb6e98a

Browse files
paurosellopaurosello
authored
Merge branch 'main' into manage-karpenter-wc-crs
2 parents a2945e5 + a778924 commit cb6e98a

9 files changed

+26
-25
lines changed

‎.github/workflows/pre_commit_go.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
- name: Set up Go environment
2020
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2121
with:
22-
go-version: "1.24"
22+
go-version: "1.25"
2323
- name: Install goimports
2424
run: |
2525
go install golang.org/x/tools/cmd/[email protected]
2626
- name: Install golangci-lint
2727
uses: giantswarm/install-binary-action@c37eb401e5092993fc76d545030b1d1769e61237 # v3.0.0
2828
with:
2929
binary: golangci-lint
30-
version: "2.1.6"
30+
version: "2.4.0"
3131
download_url: "https://github.com/golangci/golangci-lint/releases/download/v${version}/${binary}-${version}-linux-amd64.tar.gz"
3232
- name: Execute pre-commit hooks
3333
uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1

‎.github/workflows/zz_generated.check_values_schema.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# devctl
44
#
5-
# https://github.com/giantswarm/devctl/blob/366c1c3aad2b9b02850a54854aba8108db3ce052/pkg/gen/input/workflows/internal/file/check_values_schema.yaml.template
5+
# https://github.com/giantswarm/devctl/blob/ad0a25fbf301b2513e169ec964a8785d28f75be4/pkg/gen/input/workflows/internal/file/check_values_schema.yaml.template
66
#
77

88
name: 'Values and schema'
@@ -19,4 +19,4 @@ on:
1919

2020
jobs:
2121
check:
22-
uses: giantswarm/github-workflows/.github/workflows/chart-values.yaml@897ce7c11f81fcd01f7cf38e839a42848a63c7e7
22+
uses: giantswarm/github-workflows/.github/workflows/chart-values.yaml@main

‎.github/workflows/zz_generated.create_release.yaml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# devctl
44
#
5-
# https://github.com/giantswarm/devctl/blob/7f65ea49e4e543a7b39a7b3cf70038a3e16641a5/pkg/gen/input/workflows/internal/file/create_release.yaml.template
5+
# https://github.com/giantswarm/devctl/blob/35dace92664421a2fed6852f48c2efe2caecd360/pkg/gen/input/workflows/internal/file/create_release.yaml.template
66
#
77
name: Create Release
88
on:
@@ -54,7 +54,7 @@ jobs:
5454
echo "version=${version}" >> $GITHUB_OUTPUT
5555
- name: Checkout code
5656
if: ${{ steps.get_version.outputs.version != '' }}
57-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
57+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5858
- name: Get project.go path
5959
id: get_project_go_path
6060
if: ${{ steps.get_version.outputs.version != '' }}
@@ -90,20 +90,20 @@ jobs:
9090
- gather_facts
9191
steps:
9292
- name: Install architect
93-
uses: giantswarm/install-binary-action@c37eb401e5092993fc76d545030b1d1769e61237 # v3.0.0
93+
uses: giantswarm/install-binary-action@0797deb878056114fa54ee30c519f617716e8c69 # v3.1.1
9494
with:
9595
binary: "architect"
9696
version: "6.14.1"
9797
- name: Install semver
98-
uses: giantswarm/install-binary-action@c37eb401e5092993fc76d545030b1d1769e61237 # v3.0.0
98+
uses: giantswarm/install-binary-action@0797deb878056114fa54ee30c519f617716e8c69 # v3.1.1
9999
with:
100100
binary: "semver"
101101
version: "3.2.0"
102102
download_url: "https://github.com/fsaintjacques/${binary}-tool/archive/${version}.tar.gz"
103103
tarball_binary_path: "*/src/${binary}"
104104
smoke_test: "${binary} --version"
105105
- name: Checkout code
106-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
106+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
107107
- name: Update project.go
108108
id: update_project_go
109109
env:
@@ -163,7 +163,7 @@ jobs:
163163
upload_url: ${{ steps.create_gh_release.outputs.upload_url }}
164164
steps:
165165
- name: Checkout code
166-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
166+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
167167
with:
168168
ref: ${{ github.sha }}
169169
- name: Ensure correct version in project.go
@@ -193,12 +193,13 @@ jobs:
193193
git push "${REMOTE_REPO}" --tags
194194
- name: Create release
195195
id: create_gh_release
196-
uses: ncipollo/release-action@440c8c1cb0ed28b9f43e4d1d670870f059653174 # v1.16.0
196+
uses: ncipollo/release-action@bcfe5470707e8832e12347755757cec0eb3c22af # v1.18.0
197197
env:
198198
GITHUB_TOKEN: "${{ secrets.TAYLORBOT_GITHUB_ACTION }}"
199199
with:
200200
body: ${{ steps.changelog_reader.outputs.changes }}
201201
tag: "v${{ needs.gather_facts.outputs.version }}"
202+
skipIfReleaseExists: true
202203

203204
create-release-branch:
204205
name: Create release branch
@@ -208,15 +209,15 @@ jobs:
208209
if: ${{ needs.gather_facts.outputs.version }}
209210
steps:
210211
- name: Install semver
211-
uses: giantswarm/install-binary-action@c37eb401e5092993fc76d545030b1d1769e61237 # v3.0.0
212+
uses: giantswarm/install-binary-action@0797deb878056114fa54ee30c519f617716e8c69 # v3.1.1
212213
with:
213214
binary: "semver"
214215
version: "3.0.0"
215216
download_url: "https://github.com/fsaintjacques/${binary}-tool/archive/${version}.tar.gz"
216217
tarball_binary_path: "*/src/${binary}"
217218
smoke_test: "${binary} --version"
218219
- name: Check out the repository
219-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
220+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
220221
with:
221222
fetch-depth: 0 # Clone the whole history, not just the most recent commit.
222223
- name: Fetch all tags and branches

‎.github/workflows/zz_generated.create_release_pr.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# devctl
44
#
5-
# https://github.com/giantswarm/devctl/blob/366c1c3aad2b9b02850a54854aba8108db3ce052/pkg/gen/input/workflows/internal/file/create_release_pr.yaml.template
5+
# https://github.com/giantswarm/devctl/blob/ad0a25fbf301b2513e169ec964a8785d28f75be4/pkg/gen/input/workflows/internal/file/create_release_pr.yaml.template
66
#
77
name: Create Release PR
88
on:
@@ -32,7 +32,7 @@ on:
3232

3333
jobs:
3434
publish:
35-
uses: giantswarm/github-workflows/.github/workflows/create-release-pr.yaml@897ce7c11f81fcd01f7cf38e839a42848a63c7e7
35+
uses: giantswarm/github-workflows/.github/workflows/create-release-pr.yaml@main
3636
with:
3737
branch: ${{ inputs.branch }}
3838
secrets:

‎.github/workflows/zz_generated.fix_vulnerabilities.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# devctl
44
#
5-
# https://github.com/giantswarm/devctl/blob/366c1c3aad2b9b02850a54854aba8108db3ce052/pkg/gen/input/workflows/internal/file/fix_vulnerabilities.yaml.template
5+
# https://github.com/giantswarm/devctl/blob/ad0a25fbf301b2513e169ec964a8785d28f75be4/pkg/gen/input/workflows/internal/file/fix_vulnerabilities.yaml.template
66
#
77

88
name: Fix Go vulnerabilities
@@ -19,7 +19,7 @@ on:
1919

2020
jobs:
2121
fix:
22-
uses: giantswarm/github-workflows/.github/workflows/fix-vulnerabilities.yaml@897ce7c11f81fcd01f7cf38e839a42848a63c7e7
22+
uses: giantswarm/github-workflows/.github/workflows/fix-vulnerabilities.yaml@main
2323
with:
2424
branch: ${{ inputs.branch || github.ref }}
2525
secrets:

‎.github/workflows/zz_generated.gitleaks.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# devctl
44
#
5-
# https://github.com/giantswarm/devctl/blob/366c1c3aad2b9b02850a54854aba8108db3ce052/pkg/gen/input/workflows/internal/file/gitleaks.yaml.template
5+
# https://github.com/giantswarm/devctl/blob/ad0a25fbf301b2513e169ec964a8785d28f75be4/pkg/gen/input/workflows/internal/file/gitleaks.yaml.template
66
#
77
name: gitleaks
88

@@ -11,4 +11,4 @@ on:
1111

1212
jobs:
1313
publish:
14-
uses: giantswarm/github-workflows/.github/workflows/gitleaks.yaml@897ce7c11f81fcd01f7cf38e839a42848a63c7e7
14+
uses: giantswarm/github-workflows/.github/workflows/gitleaks.yaml@main

‎.github/workflows/zz_generated.run_ossf_scorecard.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# devctl
44
#
5-
# https://github.com/giantswarm/devctl/blob/366c1c3aad2b9b02850a54854aba8108db3ce052/pkg/gen/input/workflows/internal/file/run_ossf_scorecard.yaml.template
5+
# https://github.com/giantswarm/devctl/blob/ad0a25fbf301b2513e169ec964a8785d28f75be4/pkg/gen/input/workflows/internal/file/run_ossf_scorecard.yaml.template
66
#
77

88
# This workflow uses actions that are not certified by GitHub. They are provided
@@ -26,6 +26,6 @@ on:
2626

2727
jobs:
2828
analysis:
29-
uses: giantswarm/github-workflows/.github/workflows/ossf-scorecard.yaml@897ce7c11f81fcd01f7cf38e839a42848a63c7e7
29+
uses: giantswarm/github-workflows/.github/workflows/ossf-scorecard.yaml@main
3030
secrets:
3131
scorecard_token: ${{ secrets.SCORECARD_TOKEN }}

‎.github/workflows/zz_generated.validate_changelog.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# devctl
44
#
5-
# https://github.com/giantswarm/devctl/blob/6b7b68677854e4a8a22e6811a743aff5abedee14/pkg/gen/input/workflows/internal/file/validate_changelog.yaml.template
5+
# https://github.com/giantswarm/devctl/blob/ad0a25fbf301b2513e169ec964a8785d28f75be4/pkg/gen/input/workflows/internal/file/validate_changelog.yaml.template
66
#
77
name: Validate changelog
88

@@ -18,4 +18,4 @@ permissions:
1818

1919
jobs:
2020
validate-changelog:
21-
uses: giantswarm/github-workflows/.github/workflows/validate-changelog.yaml@f521ed67a6d5dc7ef628138d4bac919f1d3d4079
21+
uses: giantswarm/github-workflows/.github/workflows/validate-changelog.yaml@main

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ minimum_pre_commit_version: '2.17'
55
repos:
66
# shell scripts
77
- repo: https://github.com/detailyang/pre-commit-shell
8-
rev: v1.0.6
8+
rev: '1.0.5'
99
hooks:
1010
- id: shell-lint
1111
args: [ --format=json ]
1212
exclude: ".*\\.template"
1313

1414
- repo: https://github.com/pre-commit/pre-commit-hooks
15-
rev: v5.0.0
15+
rev: v6.0.0
1616
hooks:
1717
- id: check-added-large-files
1818
- id: check-merge-conflict

0 commit comments

Comments
 (0)