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

faddat/upgrade go #1279

Merged
merged 5 commits into from
Sep 12, 2023
Merged

faddat/upgrade go #1279

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9eebace
upgrade ci to go 1.21
faddat Sep 1, 2023
f677821
upgrade to go1.21
faddat Sep 1, 2023
362271b
Merge remote-tracking branch 'origin/main' into faddat/upgrade-go
faddat Sep 1, 2023
1194dd4
Merge remote-tracking branch 'origin/main' into faddat/upgrade-go
faddat Sep 9, 2023
c2bd02f
Merge branch 'main' into faddat/upgrade-go
jtieri Sep 12, 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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up Go 1.20
faddat marked this conversation as resolved.
Show resolved Hide resolved
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.21'

# setup gopath
- name: Set PATH
Expand All @@ -40,4 +40,4 @@ jobs:
uses: actions/upload-artifact@v1
with:
name: rly
path: ./build/rly
path: ./build/rly
16 changes: 8 additions & 8 deletions .github/workflows/interchaintest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set up Go 1.20
faddat marked this conversation as resolved.
Show resolved Hide resolved
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.21'

- name: checkout relayer
uses: actions/checkout@v2
Expand All @@ -34,7 +34,7 @@ jobs:
- name: Set up Go 1.20
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.21'

- name: checkout relayer
uses: actions/checkout@v2
Expand All @@ -55,7 +55,7 @@ jobs:
- name: Set up Go 1.20
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.21'

- name: checkout relayer
uses: actions/checkout@v2
Expand All @@ -76,7 +76,7 @@ jobs:
- name: Set up Go 1.20
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.21'

- name: checkout relayer
uses: actions/checkout@v2
Expand All @@ -97,7 +97,7 @@ jobs:
- name: Set up Go 1.20
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.21'

- name: checkout relayer
uses: actions/checkout@v2
Expand All @@ -118,7 +118,7 @@ jobs:
- name: Set up Go 1.20
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.21'

- name: checkout relayer
uses: actions/checkout@v2
Expand All @@ -139,7 +139,7 @@ jobs:
- name: Set up Go 1.20
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.21'

- name: checkout relayer
uses: actions/checkout@v2
Expand All @@ -152,4 +152,4 @@ jobs:
${{ runner.os }}-go-

- name: interchaintest
run: make interchaintest-scenario
run: make interchaintest-scenario
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Release"
name: 'Release'

on:
push:
Expand All @@ -17,9 +17,9 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.21'

- run: echo https://github.com/cosmos/relayer/blob/${GITHUB_REF#refs/tags/}/CHANGELOG.md#${GITHUB_REF#refs/tags/} > ../release_notes.md
- run: echo https://github.com/cosmos/relayer/blob/${GITHUB_REF#refs/tags/}/CHANGELOG.md#${GITHUB_REF#refs/tags/} > ../release_notes.md

- name: setup release environment
run: |-
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
FROM --platform=$BUILDPLATFORM golang:1.20-alpine3.16 AS build-env
FROM --platform=$BUILDPLATFORM golang:1.21-alpine3.17 AS build-env

RUN apk add --update --no-cache curl make git libc-dev bash gcc linux-headers eudev-dev

ARG TARGETARCH
ARG BUILDARCH

RUN if [ "${TARGETARCH}" = "arm64" ] && [ "${BUILDARCH}" != "arm64" ]; then \
wget -c https://musl.cc/aarch64-linux-musl-cross.tgz -O - | tar -xzvv --strip-components 1 -C /usr; \
wget -c https://musl.cc/aarch64-linux-musl-cross.tgz -O - | tar -xzvv --strip-components 1 -C /usr; \
elif [ "${TARGETARCH}" = "amd64" ] && [ "${BUILDARCH}" != "amd64" ]; then \
wget -c https://musl.cc/x86_64-linux-musl-cross.tgz -O - | tar -xzvv --strip-components 1 -C /usr; \
wget -c https://musl.cc/x86_64-linux-musl-cross.tgz -O - | tar -xzvv --strip-components 1 -C /usr; \
fi

ADD . .

RUN if [ "${TARGETARCH}" = "arm64" ] && [ "${BUILDARCH}" != "arm64" ]; then \
export CC=aarch64-linux-musl-gcc CXX=aarch64-linux-musl-g++;\
export CC=aarch64-linux-musl-gcc CXX=aarch64-linux-musl-g++;\
elif [ "${TARGETARCH}" = "amd64" ] && [ "${BUILDARCH}" != "amd64" ]; then \
export CC=x86_64-linux-musl-gcc CXX=x86_64-linux-musl-g++; \
export CC=x86_64-linux-musl-gcc CXX=x86_64-linux-musl-g++; \
fi; \
GOOS=linux GOARCH=$TARGETARCH CGO_ENABLED=1 LDFLAGS='-linkmode external -extldflags "-static"' make install

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/cosmos/relayer/v2

go 1.20
go 1.21

require (
cosmossdk.io/api v0.3.1
Expand Down
50 changes: 50 additions & 0 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

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.20
go 1.21

use (
.
Expand Down
2 changes: 1 addition & 1 deletion interchaintest/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/cosmos/relayer/v2/interchaintest

go 1.20
go 1.21

require (
cosmossdk.io/simapp v0.0.0-20230224204036-a6adb0821462
Expand Down
Loading