Skip to content

Commit

Permalink
maint: Upgrade to Go 1.21.4 (#389)
Browse files Browse the repository at this point in the history
Upades Go to 1.21.4 and removes the old workaround around the fact that
golang-1.21-go is behind. Not because it is solved, but rather because
the workaround does not work.
  • Loading branch information
EduardGomezEscandell authored Nov 8, 2023
2 parents 870c5eb + 6b557e0 commit 5899a22
Show file tree
Hide file tree
Showing 13 changed files with 12 additions and 22 deletions.
10 changes: 0 additions & 10 deletions .github/workflows/qa-azure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,6 @@ jobs:
steps:
- name: Check out repository
uses: actions/checkout@v4
# The following two steps are a workaround because vulnerability checker requires Go 1.21.3 which is not yet available on the archive.
# That requirement only affects test code using mocks, so we don't yet depend on such contracts.
# We should be safe with Go 1.21.1 for a while, until dependencies start to rely on the latest version.
- uses: actions/setup-go@v4
with:
go-version-file: go.work
- name: Constrain go version
shell: bash
working-directory: wsl-pro-service
run: go mod edit -go 1.21.1
- name: Build debian package
uses: canonical/desktop-engineering/gh-actions/common/build-debian@main
with:
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ linters-settings:
staticcheck:
# Should be better for it to be autodetected
# https://github.com/golangci/golangci-lint/issues/2234
go: "1.21.3"
go: "1.21.4"
2 changes: 1 addition & 1 deletion agentapi/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/canonical/ubuntu-pro-for-windows/agentapi

go 1.21.3
go 1.21.4

require (
google.golang.org/grpc v1.59.0
Expand Down
2 changes: 1 addition & 1 deletion common/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/canonical/ubuntu-pro-for-windows/common

go 1.21.3
go 1.21.4

require (
github.com/google/uuid v1.4.0
Expand Down
2 changes: 1 addition & 1 deletion contractsapi/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/canonical/ubuntu-pro-for-windows/contractsapi

go 1.21.3
go 1.21.4
2 changes: 1 addition & 1 deletion end-to-end/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/canonical/ubuntu-pro-for-windows/end-to-end

go 1.21.3
go 1.21.4

require (
github.com/canonical/ubuntu-pro-for-windows/common v0.0.0-20230906090052-60fb5d60ada4
Expand Down
2 changes: 1 addition & 1 deletion go.work
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
go 1.21.3
go 1.21.4

use (
./agentapi
Expand Down
2 changes: 1 addition & 1 deletion mocks/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/canonical/ubuntu-pro-for-windows/mocks

go 1.21.3
go 1.21.4

require (
github.com/canonical/landscape-hostagent-api v0.0.0-20230606055347-dd0b7f618303
Expand Down
2 changes: 1 addition & 1 deletion storeapi/go-wrapper/microsoftstore/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/canonical/ubuntu-pro-for-windows/storeapi/go-wrapper/microsoftstore

go 1.21.3
go 1.21.4

require (
github.com/canonical/ubuntu-pro-for-windows/common v0.0.0-20230905125854-3f98ad6913ab
Expand Down
2 changes: 1 addition & 1 deletion tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/canonical/ubuntu-pro-for-windows/tools

go 1.21.3
go 1.21.4

require (
github.com/canonical/ubuntu-pro-for-windows/windows-agent v0.0.0-20230906090052-60fb5d60ada4
Expand Down
2 changes: 1 addition & 1 deletion windows-agent/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/canonical/ubuntu-pro-for-windows/windows-agent

go 1.21.3
go 1.21.4

require (
github.com/canonical/landscape-hostagent-api v0.0.0-20230606055347-dd0b7f618303
Expand Down
2 changes: 1 addition & 1 deletion wsl-pro-service/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/canonical/ubuntu-pro-for-windows/wsl-pro-service

go 1.21.3
go 1.21.4

require (
github.com/canonical/ubuntu-pro-for-windows/agentapi v0.0.0-20231023183501-458a10db4c16
Expand Down
2 changes: 1 addition & 1 deletion wslserviceapi/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/canonical/ubuntu-pro-for-windows/wslserviceapi

go 1.21.3
go 1.21.4

require (
google.golang.org/grpc v1.59.0
Expand Down

0 comments on commit 5899a22

Please sign in to comment.