Skip to content

Commit dcdc5f1

Browse files
authored
Merge pull request #1204 from cpanato/ci-go-updates
CI and Go updates
2 parents 82553ac + baeb57b commit dcdc5f1

File tree

10 files changed

+69
-21
lines changed

10 files changed

+69
-21
lines changed

.github/dependabot.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
version: 2
23
updates:
34
- package-ecosystem: gomod
@@ -17,6 +18,11 @@ updates:
1718
# Ignore k8s and its transitives modules as they are upgraded manually
1819
# together with controller-runtime.
1920
- dependency-name: "k8s.io/*"
21+
groups:
22+
all:
23+
update-types:
24+
- "minor"
25+
- "patch"
2026

2127
- package-ecosystem: "docker"
2228
directory: "/"
@@ -26,3 +32,23 @@ updates:
2632
- "area/dependency"
2733
- "release-note-none"
2834
- "ok-to-test"
35+
groups:
36+
all:
37+
update-types:
38+
- "minor"
39+
- "patch"
40+
41+
- package-ecosystem: "github-actions"
42+
directory: "/"
43+
schedule:
44+
interval: daily
45+
open-pull-requests-limit: 10
46+
labels:
47+
- "area/dependency"
48+
- "release-note-none"
49+
- "ok-to-test"
50+
groups:
51+
all:
52+
update-types:
53+
- "minor"
54+
- "patch"

.github/workflows/codespell.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
# Helps catch spelling errors
22
name: Codespell
3-
on: [ pull_request ]
3+
4+
on:
5+
pull_request:
46

57
jobs:
68
codespell:
79
runs-on: ubuntu-latest
810
steps:
9-
- uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v2.5.0
10-
- uses: codespell-project/actions-codespell@22ff5a2e4b591290baf82d47c9feadac31c65441 # v1.0
11+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
12+
13+
- uses: codespell-project/actions-codespell@94259cd8be02ad2903ba34a22d9c13de21a74461 # v2.0
1114
with:
1215
skip: .git,_artifacts,*.sum
1316
ignore_words_file: .codespellignore

.github/workflows/cover.yaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
# add public code coverage reports
2+
name: coverage
3+
24
on:
35
push:
46
branches:
57
- main
8+
69
jobs:
710
coverage:
811
runs-on: ubuntu-latest
912
steps:
10-
- uses: actions/checkout@master
13+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
14+
1115
- run: "make test-cover"
12-
- uses: codecov/codecov-action@v2
13-
with:
14-
file: ./coverage.out
15-
fail_ci_if_error: true
16+
17+
- uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
18+
with:
19+
file: ./coverage.out
20+
fail_ci_if_error: true

.github/workflows/link-check.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Check for broken links
22
name: Link-check
3+
34
on:
45
push:
56
paths:
@@ -8,13 +9,16 @@ on:
89
- main
910
pull_request:
1011
paths: "docs/**"
12+
1113
jobs:
1214
lint_docs:
1315
name: Broken Links
1416
runs-on: ubuntu-latest
17+
1518
steps:
16-
- uses: actions/checkout@v2
17-
- uses: gaurav-nelson/github-action-markdown-link-check@v1
19+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
20+
21+
- uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec # v1.0.15
1822
with:
1923
use-quiet-mode: 'yes'
2024
config-file: ".markdownlinkcheck.json"

.github/workflows/lint.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: Lint
2-
on: [pull_request]
2+
3+
on:
4+
pull_request:
35

46
permissions:
57
contents: read
@@ -8,14 +10,18 @@ jobs:
810
golangci:
911
name: lint
1012
runs-on: ubuntu-latest
13+
1114
steps:
12-
- uses: actions/checkout@v3
13-
- uses: actions/setup-go@v4
15+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
16+
17+
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
1418
with:
1519
go-version: "1.21"
1620
check-latest: true
1721
cache: false
22+
1823
- name: golangci-lint
19-
uses: golangci/golangci-lint-action@v3
24+
uses: golangci/golangci-lint-action3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0
2025
with:
21-
version: "v1.55"
26+
timeout: 10m
27+
version: v1.57

.github/workflows/pr-gh-workflow-approve.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@ on:
1111
jobs:
1212
approve:
1313
name: Approve ok-to-test
14+
1415
if: contains(github.event.pull_request.labels.*.name, 'ok-to-test')
16+
1517
runs-on: ubuntu-latest
18+
1619
permissions:
1720
actions: write
21+
1822
steps:
1923
- name: Update PR
20-
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
24+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
2125
continue-on-error: true
2226
with:
2327
github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -37,4 +41,4 @@ jobs:
3741
repo: context.repo.repo,
3842
run_id: run.id
3943
});
40-
}
44+
}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Build the manager binary
16-
FROM golang:1.21.7@sha256:549dd88a1a53715f177b41ab5fee25f7a376a6bb5322ac7abe263480d9554021 as builder
16+
FROM golang:1.21.9@sha256:ff6cfbd291c157a5b67e121b050e80a646a88b55de5c489a5c07acb9528a1feb as builder
1717
WORKDIR /workspace
1818

1919
# Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ endif
140140
# Build time versioning details.
141141
LDFLAGS := $(shell hack/version.sh)
142142

143-
GOLANG_VERSION := 1.21.6
143+
GOLANG_VERSION := 1.21.9
144144

145145
# CI
146146
CAPG_WORKER_CLUSTER_KUBECONFIG ?= "/tmp/kubeconfig"

hack/tools/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/cluster-api-provider-gcp/hack/tools
22

3-
go 1.21.7
3+
go 1.21.9
44

55
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.2
66

netlify.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
publish = "docs/book/book"
55

66
[build.environment]
7-
GO_VERSION = "1.21.7"
7+
GO_VERSION = "1.21.9"
88

99
# Standard Netlify redirects
1010
[[redirects]]

0 commit comments

Comments
 (0)