Skip to content

Commit 6a8bba0

Browse files
stefanprodanstefanprodan
committed
Update dependencies to Go 1.22
Signed-off-by: Stefan Prodan <[email protected]>
1 parent f66acf2 commit 6a8bba0

File tree

10 files changed

+87
-101
lines changed

10 files changed

+87
-101
lines changed

‎.github/workflows/build.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,11 @@ jobs:
1212
steps:
1313
- name: Checkout
1414
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
15-
- name: Restore Go cache
16-
uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
17-
with:
18-
path: ~/go/pkg/mod
19-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
20-
restore-keys: |
21-
${{ runner.os }}-go-
2215
- name: Setup Go
2316
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2417
with:
25-
go-version: 1.21.x
18+
go-version-file: 'go.mod'
19+
cache: true
2620
- name: Run vet
2721
run: make tidy fmt vet
2822
- name: Check if working tree is dirty

‎.github/workflows/e2e-gitea.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,11 @@ jobs:
1616
steps:
1717
- name: Checkout
1818
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
19-
- name: Restore Go cache
20-
uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
21-
with:
22-
path: ~/go/pkg/mod
23-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
24-
restore-keys: |
25-
${{ runner.os }}-go-
2619
- name: Setup Go
2720
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2821
with:
29-
go-version: 1.21.x
22+
go-version-file: 'go.mod'
23+
cache: true
3024
- name: Start Provider instances
3125
run: make start-provider-instances-gitea GITEA_VERSION=1.21.1@sha256:63165c64759c98e55f0afdb5fc3be64cbb27180d3474e951fa027228e6955029
3226
- name: Run tests [gitea]

‎.github/workflows/e2e-github.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,11 @@ jobs:
1414
steps:
1515
- name: Checkout
1616
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
17-
- name: Restore Go cache
18-
uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
19-
with:
20-
path: ~/go/pkg/mod
21-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
22-
restore-keys: |
23-
${{ runner.os }}-go-
2417
- name: Setup Go
2518
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2619
with:
27-
go-version: 1.21.x
20+
go-version-file: 'go.mod'
21+
cache: true
2822
- name: Run tests
2923
run: |
3024
[ -n "${{ secrets.GITPROVIDER_BOT_TOKEN }}" ] && export GITHUB_TOKEN=${{ secrets.GITPROVIDER_BOT_TOKEN }} || echo "using default GITHUB_TOKEN"

‎.github/workflows/e2e-gitlab.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,11 @@ jobs:
1616
steps:
1717
- name: Checkout
1818
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
19-
- name: Restore Go cache
20-
uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
21-
with:
22-
path: ~/go/pkg/mod
23-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
24-
restore-keys: |
25-
${{ runner.os }}-go-
2619
- name: Setup Go
2720
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2821
with:
29-
go-version: 1.21.x
22+
go-version-file: 'go.mod'
23+
cache: true
3024
- name: Start Provider instances
3125
run: make start-provider-instances-gitlab
3226
- name: Run tests [gitlab]

‎.github/workflows/e2e-stash.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,11 @@ jobs:
1414
steps:
1515
- name: Checkout
1616
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
17-
- name: Restore Go cache
18-
uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
19-
with:
20-
path: ~/go/pkg/mod
21-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
22-
restore-keys: |
23-
${{ runner.os }}-go-
2417
- name: Setup Go
2518
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2619
with:
27-
go-version: 1.21.x
20+
go-version-file: 'go.mod'
21+
cache: true
2822
- name: Run tests
2923
run: |
3024
[ -n "${{ secrets.STASH_TOKEN }}" ] && export STASH_TOKEN=${{ secrets.STASH_TOKEN }} || echo "using default STASH_TOKEN"

‎.github/workflows/release.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,11 @@ jobs:
1313
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
1414
- name: Unshallow
1515
run: git fetch --prune --unshallow
16-
- name: Restore Go cache
17-
uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
18-
with:
19-
path: ~/go/pkg/mod
20-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
21-
restore-keys: |
22-
${{ runner.os }}-go-
2316
- name: Setup Go
2417
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2518
with:
26-
go-version: 1.21.x
19+
go-version-file: 'go.mod'
20+
cache: true
2721
- name: Download release notes utility
2822
env:
2923
GH_REL_URL: https://github.com/buchanae/github-release-notes/releases/download/0.2.0/github-release-notes-linux-amd64-0.2.0.tar.gz

‎.github/workflows/scan.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ jobs:
2020
steps:
2121
- name: Checkout
2222
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
23+
- name: Setup Go
24+
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
25+
with:
26+
go-version-file: 'go.mod'
27+
cache: true
2328
- name: Initialize CodeQL
2429
uses: github/codeql-action/init@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4
2530
with:

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ TEST_PATTERN?=./...
44
all: test
55

66
tidy:
7-
go mod tidy -compat=1.18
7+
go mod tidy -compat=1.22
88

99
fmt:
1010
go fmt ./...

‎go.mod

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/fluxcd/go-git-providers
22

3-
go 1.20
3+
go 1.22
44

55
require (
66
code.gitea.io/sdk/gitea v0.17.1
77
github.com/ProtonMail/go-crypto v1.0.0
88
github.com/go-git/go-billy/v5 v5.5.0
9-
github.com/go-git/go-git/v5 v5.11.0
9+
github.com/go-git/go-git/v5 v5.12.0
1010
github.com/go-logr/logr v1.4.1
1111
github.com/go-logr/zapr v1.3.0
1212
github.com/google/go-cmp v0.6.0
@@ -15,15 +15,15 @@ require (
1515
github.com/hashicorp/go-cleanhttp v0.5.2
1616
github.com/hashicorp/go-multierror v1.1.1
1717
github.com/hashicorp/go-retryablehttp v0.7.5
18-
github.com/ktrysmt/go-bitbucket v0.9.74
18+
github.com/ktrysmt/go-bitbucket v0.9.77
1919
github.com/onsi/ginkgo v1.16.5
20-
github.com/onsi/gomega v1.30.0
21-
github.com/xanzy/go-gitlab v0.96.0
22-
go.uber.org/zap v1.26.0
23-
golang.org/x/crypto v0.18.0
24-
golang.org/x/oauth2 v0.16.0
20+
github.com/onsi/gomega v1.32.0
21+
github.com/xanzy/go-gitlab v0.101.0
22+
go.uber.org/zap v1.27.0
23+
golang.org/x/crypto v0.21.0
24+
golang.org/x/oauth2 v0.18.0
2525
golang.org/x/time v0.5.0
26-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
26+
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
2727
)
2828

2929
require (
@@ -46,17 +46,17 @@ require (
4646
github.com/mitchellh/mapstructure v1.5.0 // indirect
4747
github.com/nxadm/tail v1.4.8 // indirect
4848
github.com/pjbgf/sha1cd v0.3.0 // indirect
49-
github.com/sergi/go-diff v1.3.1 // indirect
50-
github.com/skeema/knownhosts v1.2.1 // indirect
49+
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
50+
github.com/skeema/knownhosts v1.2.2 // indirect
5151
github.com/xanzy/ssh-agent v0.3.3 // indirect
5252
go.uber.org/multierr v1.10.0 // indirect
53-
golang.org/x/mod v0.14.0 // indirect
54-
golang.org/x/net v0.20.0 // indirect
55-
golang.org/x/sys v0.16.0 // indirect
53+
golang.org/x/mod v0.16.0 // indirect
54+
golang.org/x/net v0.22.0 // indirect
55+
golang.org/x/sys v0.18.0 // indirect
5656
golang.org/x/text v0.14.0 // indirect
57-
golang.org/x/tools v0.17.0 // indirect
57+
golang.org/x/tools v0.19.0 // indirect
5858
google.golang.org/appengine v1.6.8 // indirect
59-
google.golang.org/protobuf v1.32.0 // indirect
59+
google.golang.org/protobuf v1.33.0 // indirect
6060
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
6161
gopkg.in/warnings.v0 v0.1.2 // indirect
6262
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)