Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Downgrade to 1.21.1 #362

Closed
wants to merge 4 commits into from
Closed

Downgrade to 1.21.1 #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7af7b41
Downgrade WSL-Pro-Service and dependencies to 1.21.1
EduardGomezEscandell Oct 25, 2023
dd2b87e
Remove go.mod manipulation in debian build
EduardGomezEscandell Oct 25, 2023
5b9d0e7
Specify go toolchain version in rules
EduardGomezEscandell Oct 25, 2023
40ce443
WSL-Pro-Service: Pin dependencies to commit 5b9d0e7eff84
EduardGomezEscandell Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .github/workflows/qa-azure.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,9 @@ 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 agentapi/go.mod
View file
Open in desktop
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.1

require (
google.golang.org/grpc v1.59.0
Expand Down
2 changes: 1 addition & 1 deletion common/go.mod
View file
Open in desktop
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.1

require (
github.com/google/uuid v1.3.1
Expand Down
2 changes: 1 addition & 1 deletion go.work
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
go 1.21.3
go 1.21.1

use (
./agentapi
Expand Down
1 change: 1 addition & 0 deletions wsl-pro-service/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
export DH_VERBOSE=1

export GOCACHE=$(shell mktemp -d /tmp/gocache-XXXX)
export GOTOOLCHAIN=go1.21.1

# We want to copy special files from our monorepo like "common/version".
export DH_GOLANG_INSTALL_ALL=1
Expand Down
8 changes: 4 additions & 4 deletions wsl-pro-service/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module github.com/canonical/ubuntu-pro-for-windows/wsl-pro-service

go 1.21.3
go 1.21.1

require (
github.com/canonical/ubuntu-pro-for-windows/agentapi v0.0.0-20231023183501-458a10db4c16
github.com/canonical/ubuntu-pro-for-windows/common v0.0.0-20231023183501-458a10db4c16
github.com/canonical/ubuntu-pro-for-windows/wslserviceapi v0.0.0-20231023183501-458a10db4c16
github.com/canonical/ubuntu-pro-for-windows/agentapi v0.0.0-20231025103252-5b9d0e7eff84
github.com/canonical/ubuntu-pro-for-windows/common v0.0.0-20231025103252-5b9d0e7eff84
github.com/canonical/ubuntu-pro-for-windows/wslserviceapi v0.0.0-20231025103252-5b9d0e7eff84
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.7.0
Expand Down
12 changes: 6 additions & 6 deletions wsl-pro-service/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/canonical/ubuntu-pro-for-windows/agentapi v0.0.0-20231023183501-458a10db4c16 h1:p894ThMw329hDKpS2tfsgZhUuWC1HfZAsq/vcRhDpGs=
github.com/canonical/ubuntu-pro-for-windows/agentapi v0.0.0-20231023183501-458a10db4c16/go.mod h1:yZFCC1gVaFNjIJ7Glk3FBiaCokcV/Jk5B6tFIlHBgd8=
github.com/canonical/ubuntu-pro-for-windows/common v0.0.0-20231023183501-458a10db4c16 h1:u7afWNLgssNSEHKxldRbgCobFnGlILpECBeAPiWyb0c=
github.com/canonical/ubuntu-pro-for-windows/common v0.0.0-20231023183501-458a10db4c16/go.mod h1:a/RSoEHIs9RmXxL/+68oDpXi8+d+TGptM/9N5ULw2Kw=
github.com/canonical/ubuntu-pro-for-windows/wslserviceapi v0.0.0-20231023183501-458a10db4c16 h1:B/iSer/eNknIEp9TnNYC56zdc6SLY6K7fXxkeFl15s8=
github.com/canonical/ubuntu-pro-for-windows/wslserviceapi v0.0.0-20231023183501-458a10db4c16/go.mod h1:gjEBJv2vc1VUqqrv1ZTDcNmd3TBBCPIlmBaR63YSX9Y=
github.com/canonical/ubuntu-pro-for-windows/agentapi v0.0.0-20231025103252-5b9d0e7eff84 h1:QEkBd3bEhbNQgWZEl3ifIhUkDP/wFPTwovjssHrW+8k=
github.com/canonical/ubuntu-pro-for-windows/agentapi v0.0.0-20231025103252-5b9d0e7eff84/go.mod h1:8p2CiywIv3MeMT4ASJfe64PPqehLUh4mYxeLYGk3dog=
github.com/canonical/ubuntu-pro-for-windows/common v0.0.0-20231025103252-5b9d0e7eff84 h1:nNJM0x5Z+rSmwzIzdaRxzmfX9GCrOZbahVO5zb2mTFE=
github.com/canonical/ubuntu-pro-for-windows/common v0.0.0-20231025103252-5b9d0e7eff84/go.mod h1:56PLZbrorRyiHgmRLS/FRAHSvavWi4W9nhu+LfBC8+w=
github.com/canonical/ubuntu-pro-for-windows/wslserviceapi v0.0.0-20231025103252-5b9d0e7eff84 h1:QfbgDsSLcFrM4wQPSjQM0KaB2QOZiMKF4amo5X6oNYI=
github.com/canonical/ubuntu-pro-for-windows/wslserviceapi v0.0.0-20231025103252-5b9d0e7eff84/go.mod h1:wShl3VjBM6p1lY9HBzkVhl12eK8peKglwADGKyicwEs=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
Expand Down
2 changes: 1 addition & 1 deletion wslserviceapi/go.mod
View file
Open in desktop
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.1

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