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

Try to use golang 1.22 #6072

Closed
wants to merge 2 commits into from
Closed

Try to use golang 1.22 #6072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f0902a
Try golang 1.22
soffokl Aug 15, 2024
143ea4d
Merge branch 'master' into add-ubuntu-noble
soffokl Aug 15, 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
2 changes: 1 addition & 1 deletion bin/aliases
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
alias myst-home="cd $GOPATH/src/github.com/mysteriumnetwork/node"
alias myst="myst-home"

alias myst-broker="myst-home && docker-compose up broker"
alias myst-broker="myst-home && docker compose up broker"
alias myst-nats="myst-broker"

alias myst-consumer="myst-home && bin/build && bin/run_consumer"
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.20.2"
IMAGE="mysteriumnetwork/xgo:1.22.2"

docker run --rm \
-v "$PWD"/$DIR_TEMP:/build \
Expand Down
2 changes: 1 addition & 1 deletion bin/builder_docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20 AS builder
FROM golang:1.22 AS builder

# Install FPM
RUN apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion bin/docker/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM golang:1.20-alpine AS builder
FROM --platform=$BUILDPLATFORM golang:1.22-alpine AS builder

# Install packages
RUN apk add --no-cache git bash gcc musl-dev make linux-headers
Expand Down
2 changes: 1 addition & 1 deletion bin/release_ppa
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ echo "myst ($VERSION+build$BUILD+$DISTR) $DISTR; urgency=medium
echo '#!/usr/bin/make -f

export DH_VERBOSE := 1
export PATH := /usr/lib/go-1.20/bin/:$(PATH)
export PATH := /usr/lib/go-1.22/bin/:$(PATH)
export GOPATH := $(CURDIR)/go
export BUILD_COMMIT := '$BUILD_COMMIT'
export BUILD_BRANCH := '$BUILD_BRANCH'
Expand Down
2 changes: 1 addition & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Maintainer: Mysterium Team <[email protected]>
Build-Depends:
dh-golang,
debhelper (>= 8.0.0),
golang-1.20,
golang-1.22,
Standards-Version: 3.9.7
Homepage: https://mysterium.network
Vcs-Git: git://github.com/mysteriumnetwork/node.git
Expand Down
2 changes: 1 addition & 1 deletion e2e/gorunner/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM golang:1.20-alpine
FROM golang:1.22-alpine

RUN apk add --no-cache bash gcc musl-dev make linux-headers iptables ipset ca-certificates openvpn bash sudo openresolv
2 changes: 1 addition & 1 deletion localnet/node/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20-alpine
FROM golang:1.22-alpine

# Install packages
RUN apk add --no-cache iptables ipset ca-certificates openvpn wireguard-tools bash sudo openresolv gcc musl-dev make linux-headers vim curl tcpdump
Expand Down
Loading