From 0b40778beccea78a91293f06f171a9dacc2377b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edu=20G=C3=B3mez=20Escandell?= Date: Wed, 8 Nov 2023 07:40:07 +0000 Subject: [PATCH 1/2] Upgrade to Go 1.21.4 --- .github/workflows/qa-azure.yaml | 2 +- .golangci.yaml | 2 +- agentapi/go.mod | 2 +- common/go.mod | 2 +- contractsapi/go.mod | 2 +- end-to-end/go.mod | 2 +- go.work | 2 +- mocks/go.mod | 2 +- storeapi/go-wrapper/microsoftstore/go.mod | 2 +- tools/go.mod | 2 +- windows-agent/go.mod | 2 +- wsl-pro-service/go.mod | 2 +- wslserviceapi/go.mod | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/qa-azure.yaml b/.github/workflows/qa-azure.yaml index 696babec8..b71a54aec 100644 --- a/.github/workflows/qa-azure.yaml +++ b/.github/workflows/qa-azure.yaml @@ -20,7 +20,7 @@ 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. + # The following two steps are a workaround because vulnerability checker requires Go 1.21.4 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 diff --git a/.golangci.yaml b/.golangci.yaml index eaa234a77..0f84df594 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -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" diff --git a/agentapi/go.mod b/agentapi/go.mod index 62bc46b9e..61fa098a3 100644 --- a/agentapi/go.mod +++ b/agentapi/go.mod @@ -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 diff --git a/common/go.mod b/common/go.mod index 4c9fa2de9..4c1867c0e 100644 --- a/common/go.mod +++ b/common/go.mod @@ -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 diff --git a/contractsapi/go.mod b/contractsapi/go.mod index ed2d3d561..d84309dac 100644 --- a/contractsapi/go.mod +++ b/contractsapi/go.mod @@ -1,3 +1,3 @@ module github.com/canonical/ubuntu-pro-for-windows/contractsapi -go 1.21.3 +go 1.21.4 diff --git a/end-to-end/go.mod b/end-to-end/go.mod index 52693c1ab..d9f6c37f3 100644 --- a/end-to-end/go.mod +++ b/end-to-end/go.mod @@ -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 diff --git a/go.work b/go.work index e2db12a0a..b2f78e08c 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.21.3 +go 1.21.4 use ( ./agentapi diff --git a/mocks/go.mod b/mocks/go.mod index c77932a1b..69c7d06c0 100644 --- a/mocks/go.mod +++ b/mocks/go.mod @@ -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 diff --git a/storeapi/go-wrapper/microsoftstore/go.mod b/storeapi/go-wrapper/microsoftstore/go.mod index 142c01565..fa032c243 100644 --- a/storeapi/go-wrapper/microsoftstore/go.mod +++ b/storeapi/go-wrapper/microsoftstore/go.mod @@ -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 diff --git a/tools/go.mod b/tools/go.mod index 1de197d7a..ab62dc8e8 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -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 diff --git a/windows-agent/go.mod b/windows-agent/go.mod index 69cfa78ae..b28b804a1 100644 --- a/windows-agent/go.mod +++ b/windows-agent/go.mod @@ -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 diff --git a/wsl-pro-service/go.mod b/wsl-pro-service/go.mod index 5889d3630..382a7cedf 100644 --- a/wsl-pro-service/go.mod +++ b/wsl-pro-service/go.mod @@ -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 diff --git a/wslserviceapi/go.mod b/wslserviceapi/go.mod index 22b061859..e56d2c46a 100644 --- a/wslserviceapi/go.mod +++ b/wslserviceapi/go.mod @@ -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 From 6b557e01d094e85b7d2ebe3caab17582bd23294f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edu=20G=C3=B3mez=20Escandell?= Date: Wed, 8 Nov 2023 11:52:23 +0200 Subject: [PATCH 2/2] Remove workaround for Go > 1.21.1 This workaround does not work, so no need to have it here anymore. --- .github/workflows/qa-azure.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/qa-azure.yaml b/.github/workflows/qa-azure.yaml index b71a54aec..187d763bd 100644 --- a/.github/workflows/qa-azure.yaml +++ b/.github/workflows/qa-azure.yaml @@ -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.4 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: