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

Revert go 1.22 support #6077

Merged
merged 5 commits into from
Sep 11, 2024
Merged

Revert go 1.22 support #6077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96c0d61
Revert "Fix go get usage for go 1.22"
Zensey Sep 11, 2024
2d0657c
Revert "Bump golang to 1.22"
Zensey Sep 11, 2024
eaff049
Revert "Set toolchain version requirement"
Zensey Sep 11, 2024
68187dd
Revert "Bump xgomobile to 1.22.2"
Zensey Sep 11, 2024
d1c0012
Revert "Upgrade gvisor to release-20240422.0 in order to fix data-rac…
Zensey Sep 11, 2024
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
10 changes: 5 additions & 5 deletions .github/workflows/build-packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.22.x'
go-version: '1.21.x'

- name: Prepare environment
run: |
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.22.x'
go-version: '1.21.x'
- uses: actions/download-artifact@v4
with:
name: env.sh
Expand All @@ -129,7 +129,7 @@ jobs:
run: |
source env.sh
unset CI # workaround for "PackageAndroid" target
go run mage.go -v ${{ matrix.platform }}
sudo -E go run mage.go -v ${{ matrix.platform }}

build-swagger:
runs-on: ubuntu-latest
Expand All @@ -144,7 +144,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.22.x'
go-version: '1.21.x'
- uses: actions/download-artifact@v4
with:
name: env.sh
Expand Down Expand Up @@ -185,7 +185,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.22.x'
go-version: '1.21.x'
- uses: actions/download-artifact@v4
with:
name: env.sh
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.22.x'
go-version: '1.21.x'
- uses: actions/download-artifact@v4
with:
name: env.sh
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.22.x'
go-version: '1.21.x'
- uses: actions/download-artifact@v4
with:
name: env.sh
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.22.x'
go-version: '1.21.x'
- uses: actions/download-artifact@v4
with:
name: env.sh
Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.22.x'
go-version: '1.21.x'
- uses: actions/download-artifact@v4
with:
name: env.sh
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests-and-linters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.22.x'
go-version: '1.21.x'

- name: Install protoc
run: |
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.22.x'
go-version: '1.21.x'

- name: Login to Docker Hub
uses: docker/login-action@v3
Expand All @@ -75,7 +75,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.22.x'
go-version: '1.21.x'

- name: Login to Docker Hub
uses: docker/login-action@v3
Expand Down
2 changes: 1 addition & 1 deletion bin/build_xgo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ DIR_BUILD="build/myst"
mkdir -p ${DIR_BUILD}
DIR_TEMP=`mktemp -d ${DIR_BUILD}/${tempname}.XXXXXX`

IMAGE="mysteriumnetwork/xgo:1.22.2"
IMAGE="mysteriumnetwork/xgo:1.20.2"

docker run --rm \
-v "$PWD"/$DIR_TEMP:/build \
Expand Down
2 changes: 1 addition & 1 deletion bin/package_android
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ docker run --rm \
-e EXT_GOPATH=/ext-go/1 \
-e GO111MODULE=on \
-e GOFLAGS=-mod=mod \
mysteriumnetwork/xgomobile:1.22.2 ./mobile/mysterium
mysteriumnetwork/xgomobile:1.20.2 ./mobile/mysterium

if [[ -f $OUT_FILENAME_AAR ]]; then
print_success "Android package ${OUT_FILENAME_AAR} build complete!"
Expand Down
3 changes: 1 addition & 2 deletions ci/packages/package.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,7 @@ func PackageDockerSwaggerRedoc() error {
}

func goGet(pkg string) error {
// don't use GO111MODULE=off with Go 1.22, as it's not supported
return sh.Run("go", "get", "-u", pkg)
return sh.RunWith(map[string]string{"GO111MODULE": "off"}, "go", "get", "-u", pkg)
}

func packageStandalone(binaryPath, os, arch string, extraEnvs map[string]string) error {
Expand Down
21 changes: 11 additions & 10 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/mysteriumnetwork/node

go 1.22.0

toolchain go1.22.2
go 1.19

require (
github.com/BurntSushi/toml v1.3.2
Expand Down Expand Up @@ -68,12 +66,12 @@ require (
golang.org/x/net v0.24.0
golang.org/x/oauth2 v0.13.0
golang.org/x/sys v0.19.0
golang.org/x/time v0.5.0
golang.org/x/time v0.4.0
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20211230205640-daad0b7ba671
golang.zx2c4.com/wireguard/windows v0.5.3
google.golang.org/protobuf v1.32.0
gvisor.dev/gvisor v0.0.0-20240420021641-b12088a5ac74 // release-20240422.0 @go branch
google.golang.org/protobuf v1.31.0
gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259
)

require (
Expand Down Expand Up @@ -142,7 +140,7 @@ require (
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gopacket v1.1.19 // indirect
Expand Down Expand Up @@ -257,9 +255,9 @@ require (
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.16.1 // indirect
golang.org/x/tools v0.15.0 // indirect
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
google.golang.org/appengine v1.6.8 // indirect
gopkg.in/intercom/intercom-go.v2 v2.0.0-20210504094731-2bd1af0ce4b2 // indirect
Expand All @@ -270,4 +268,7 @@ require (
rsc.io/tmplfunc v0.0.3 // indirect
)

replace golang.zx2c4.com/wireguard => github.com/mysteriumnetwork/wireguard-go v0.0.0-20240416113031-406b13e8996a
replace (
golang.zx2c4.com/wireguard => github.com/mysteriumnetwork/wireguard-go v0.0.0-20240416113031-406b13e8996a
//gvisor.dev/gvisor => github.com/mysteriumnetwork/gvisor v0.0.0-20240206094932-ff91e662b9e8
)
Loading