Skip to content

Commit 0ef16e2

Browse files
ymaniukevichymaniukevich
authored
Merge branch 'crossplane-contrib:master' into master
2 parents de0e9bc + c742efe commit 0ef16e2

File tree

29 files changed

+448
-340
lines changed

29 files changed

+448
-340
lines changed

‎.github/workflows/backport.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
# The main gotcha with this action is that PRs _must_ be labelled before they're
1919
# merged to trigger a backport.
2020
open-pr:
21-
runs-on: ubuntu-22.04
21+
runs-on: ubuntu-24.04
2222
if: github.event.pull_request.merged
2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2626

2727
- name: Open Backport PR
28-
uses: korthout/backport-action@v1
28+
uses: korthout/backport-action@bd68141f079bd036e45ea8149bc9d174d5a04703 # v1

‎.github/workflows/ci.yml‎

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ on:
1010

1111
env:
1212
# Common versions
13-
GO_VERSION: '1.21'
14-
GOLANGCI_VERSION: 'v1.54.0'
15-
DOCKER_BUILDX_VERSION: 'v0.9.1'
13+
GO_VERSION: '1.23'
14+
GOLANGCI_VERSION: 'v2.1.2'
15+
DOCKER_BUILDX_VERSION: 'v0.23.0'
1616

1717
# Common users. We can't run a step 'if secrets.AWS_USR != ""' but we can run
1818
# a step 'if env.AWS_USR' != ""', so we copy these to succinctly test whether
@@ -23,13 +23,13 @@ env:
2323

2424
jobs:
2525
detect-noop:
26-
runs-on: ubuntu-22.04
26+
runs-on: ubuntu-24.04
2727
outputs:
2828
noop: ${{ steps.noop.outputs.should_skip }}
2929
steps:
3030
- name: Detect No-op Changes
3131
id: noop
32-
uses: fkirc/skip-duplicate-actions@v5.2.0
32+
uses: fkirc/skip-duplicate-actions@f75f66ce1886f00957d99748a42c724f4330bdcf # v5.3.1
3333
with:
3434
github_token: ${{ secrets.GITHUB_TOKEN }}
3535
paths_ignore: '["**.md", "**.png", "**.jpg"]'
@@ -38,18 +38,18 @@ jobs:
3838

3939

4040
lint:
41-
runs-on: ubuntu-22.04
41+
runs-on: ubuntu-24.04
4242
needs: detect-noop
4343
if: needs.detect-noop.outputs.noop != 'true'
4444

4545
steps:
4646
- name: Checkout
47-
uses: actions/checkout@v3
47+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4848
with:
4949
submodules: true
5050

5151
- name: Setup Go
52-
uses: actions/setup-go@v3
52+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
5353
with:
5454
go-version: ${{ env.GO_VERSION }}
5555

@@ -58,14 +58,14 @@ jobs:
5858
run: echo "cachedir=$(make go.cachedir)" >> $GITHUB_ENV
5959

6060
- name: Cache the Go Build Cache
61-
uses: actions/cache@v3
61+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
6262
with:
6363
path: ${{ env.cachedir }}
6464
key: ${{ runner.os }}-build-lint-${{ hashFiles('**/go.sum') }}
6565
restore-keys: ${{ runner.os }}-build-lint-
6666

6767
- name: Cache Go Dependencies
68-
uses: actions/cache@v3
68+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
6969
with:
7070
path: .work/pkg
7171
key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
@@ -77,24 +77,23 @@ jobs:
7777
# We could run 'make lint' but we prefer this action because it leaves
7878
# 'annotations' (i.e. it comments on PRs to point out linter violations).
7979
- name: Lint
80-
uses: golangci/golangci-lint-action@v3
80+
uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7.0.0
8181
with:
8282
version: ${{ env.GOLANGCI_VERSION }}
83-
skip-go-installation: true
8483

8584
check-diff:
86-
runs-on: ubuntu-22.04
85+
runs-on: ubuntu-24.04
8786
needs: detect-noop
8887
if: needs.detect-noop.outputs.noop != 'true'
8988

9089
steps:
9190
- name: Checkout
92-
uses: actions/checkout@v3
91+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
9392
with:
9493
submodules: true
9594

9695
- name: Setup Go
97-
uses: actions/setup-go@v3
96+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
9897
with:
9998
go-version: ${{ env.GO_VERSION }}
10099

@@ -103,14 +102,14 @@ jobs:
103102
run: echo "cachedir=$(make go.cachedir)" >> $GITHUB_ENV
104103

105104
- name: Cache the Go Build Cache
106-
uses: actions/cache@v3
105+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
107106
with:
108107
path: ${{ env.cachedir }}
109108
key: ${{ runner.os }}-build-check-diff-${{ hashFiles('**/go.sum') }}
110109
restore-keys: ${{ runner.os }}-build-check-diff-
111110

112111
- name: Cache Go Dependencies
113-
uses: actions/cache@v3
112+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
114113
with:
115114
path: .work/pkg
116115
key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
@@ -130,21 +129,21 @@ jobs:
130129
run: git diff
131130

132131
unit-tests:
133-
runs-on: ubuntu-22.04
132+
runs-on: ubuntu-24.04
134133
needs: detect-noop
135134
if: needs.detect-noop.outputs.noop != 'true'
136135

137136
steps:
138137
- name: Checkout
139-
uses: actions/checkout@v3
138+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
140139
with:
141140
submodules: true
142141

143142
- name: Fetch History
144143
run: git fetch --prune --unshallow
145144

146145
- name: Setup Go
147-
uses: actions/setup-go@v3
146+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
148147
with:
149148
go-version: ${{ env.GO_VERSION }}
150149

@@ -153,14 +152,14 @@ jobs:
153152
run: echo "cachedir=$(make go.cachedir)" >> $GITHUB_ENV
154153

155154
- name: Cache the Go Build Cache
156-
uses: actions/cache@v3
155+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
157156
with:
158157
path: ${{ env.cachedir }}
159158
key: ${{ runner.os }}-build-unit-tests-${{ hashFiles('**/go.sum') }}
160159
restore-keys: ${{ runner.os }}-build-unit-tests-
161160

162161
- name: Cache Go Dependencies
163-
uses: actions/cache@v3
162+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
164163
with:
165164
path: .work/pkg
166165
key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
@@ -173,38 +172,38 @@ jobs:
173172
run: make -j2 test
174173

175174
- name: Publish Unit Test Coverage
176-
uses: codecov/codecov-action@v3
175+
uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
177176
with:
178177
flags: unittests
179-
file: _output/tests/linux_amd64/coverage.txt
178+
files: _output/tests/linux_amd64/coverage.txt
180179

181180
e2e-tests:
182-
runs-on: ubuntu-22.04
181+
runs-on: ubuntu-24.04
183182
needs: detect-noop
184183
if: needs.detect-noop.outputs.noop != 'true'
185184

186185
steps:
187186
- name: Setup QEMU
188-
uses: docker/setup-qemu-action@v2
187+
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
189188
with:
190189
platforms: all
191190

192191
- name: Setup Docker Buildx
193-
uses: docker/setup-buildx-action@v2
192+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
194193
with:
195194
version: ${{ env.DOCKER_BUILDX_VERSION }}
196195
install: true
197196

198197
- name: Checkout
199-
uses: actions/checkout@v3
198+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
200199
with:
201200
submodules: true
202201

203202
- name: Fetch History
204203
run: git fetch --prune --unshallow
205204

206205
- name: Setup Go
207-
uses: actions/setup-go@v3
206+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
208207
with:
209208
go-version: ${{ env.GO_VERSION }}
210209

@@ -213,14 +212,14 @@ jobs:
213212
run: echo "cachedir=$(make go.cachedir)" >> $GITHUB_ENV
214213

215214
- name: Cache the Go Build Cache
216-
uses: actions/cache@v3
215+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
217216
with:
218217
path: ${{ env.cachedir }}
219218
key: ${{ runner.os }}-build-unit-tests-${{ hashFiles('**/go.sum') }}
220219
restore-keys: ${{ runner.os }}-build-unit-tests-
221220

222221
- name: Cache Go Dependencies
223-
uses: actions/cache@v3
222+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
224223
with:
225224
path: .work/pkg
226225
key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
@@ -240,40 +239,40 @@ jobs:
240239
run: make e2e USE_HELM=true
241240

242241
publish-artifacts:
243-
runs-on: ubuntu-22.04
242+
runs-on: ubuntu-24.04
244243
needs: detect-noop
245244
if: needs.detect-noop.outputs.noop != 'true'
246245

247246
steps:
248247
- name: Setup QEMU
249-
uses: docker/setup-qemu-action@v2
248+
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
250249
with:
251250
platforms: all
252251

253252
- name: Setup Docker Buildx
254-
uses: docker/setup-buildx-action@v2
253+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
255254
with:
256255
version: ${{ env.DOCKER_BUILDX_VERSION }}
257256
install: true
258257

259258
- name: Login to Upbound
260-
uses: docker/login-action@v1
259+
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
261260
if: env.XPKG_ACCESS_ID != ''
262261
with:
263262
registry: xpkg.upbound.io
264263
username: ${{ secrets.XPKG_ACCESS_ID }}
265264
password: ${{ secrets.XPKG_TOKEN }}
266265

267266
- name: Checkout
268-
uses: actions/checkout@v3
267+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
269268
with:
270269
submodules: true
271270

272271
- name: Fetch History
273272
run: git fetch --prune --unshallow
274273

275274
- name: Setup Go
276-
uses: actions/setup-go@v3
275+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
277276
with:
278277
go-version: ${{ env.GO_VERSION }}
279278

@@ -282,14 +281,14 @@ jobs:
282281
run: echo "cachedir=$(make go.cachedir)" >> $GITHUB_ENV
283282

284283
- name: Cache the Go Build Cache
285-
uses: actions/cache@v3
284+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
286285
with:
287286
path: ${{ env.cachedir }}
288287
key: ${{ runner.os }}-build-publish-artifacts-${{ hashFiles('**/go.sum') }}
289288
restore-keys: ${{ runner.os }}-build-publish-artifacts-
290289

291290
- name: Cache Go Dependencies
292-
uses: actions/cache@v3
291+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
293292
with:
294293
path: .work/pkg
295294
key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
@@ -306,7 +305,7 @@ jobs:
306305
BUILD_ARGS: "--load"
307306

308307
- name: Publish Artifacts to GitHub
309-
uses: actions/upload-artifact@v3
308+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
310309
with:
311310
name: output
312311
path: _output/**
@@ -316,7 +315,7 @@ jobs:
316315
run: make publish BRANCH_NAME=${GITHUB_REF##*/}
317316

318317
- name: Login to Docker
319-
uses: docker/login-action@v1
318+
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
320319
if: env.CONTRIB_DOCKER_USR != ''
321320
with:
322321
username: ${{ secrets.CONTRIB_DOCKER_USR }}

‎.github/workflows/codeql.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,34 @@ on:
99

1010
jobs:
1111
detect-noop:
12-
runs-on: ubuntu-22.04
12+
runs-on: ubuntu-24.04
1313
outputs:
1414
noop: ${{ steps.noop.outputs.should_skip }}
1515
steps:
1616
- name: Detect No-op Changes
1717
id: noop
18-
uses: fkirc/skip-duplicate-actions@v5.2.0
18+
uses: fkirc/skip-duplicate-actions@f75f66ce1886f00957d99748a42c724f4330bdcf # v5.3.1
1919
with:
2020
github_token: ${{ secrets.GITHUB_TOKEN }}
2121
paths_ignore: '["**.md", "**.png", "**.jpg"]'
2222
do_not_skip: '["workflow_dispatch", "schedule", "push"]'
2323
concurrent_skipping: false
2424

2525
analyze:
26-
runs-on: ubuntu-22.04
26+
runs-on: ubuntu-24.04
2727
needs: detect-noop
2828
if: needs.detect-noop.outputs.noop != 'true'
2929

3030
steps:
3131
- name: Checkout
32-
uses: actions/checkout@v3
32+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3333
with:
3434
submodules: true
3535

3636
- name: Initialize CodeQL
37-
uses: github/codeql-action/init@v2
37+
uses: github/codeql-action/init@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
3838
with:
3939
languages: go
4040

4141
- name: Perform CodeQL Analysis
42-
uses: github/codeql-action/analyze@v2
42+
uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16

0 commit comments

Comments
 (0)