From 5bbf0f4432a81dd56dbd43601ed7e726f0003b9a Mon Sep 17 00:00:00 2001 From: crwxaj <52156245+crwxaj@users.noreply.github.com> Date: Thu, 18 Aug 2022 23:47:15 +0200 Subject: [PATCH] minor: update to Go 1.19 (#925) * update goreleaser * remove minor changes from release notes * update go vesion * update go version Co-authored-by: crwxaj --- .github/workflows/lint.yml | 2 +- .gitpod.dockerfile | 6 +++--- .goreleaser.yml | 5 +++-- Makefile | 10 +++++----- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4da58de3c..dc1c138f4 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,7 +15,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: 1.13.x + go-version: 1.19.x - name: Install Node.js uses: actions/setup-node@v3 diff --git a/.gitpod.dockerfile b/.gitpod.dockerfile index 58a7c4398..fa5d7c48a 100644 --- a/.gitpod.dockerfile +++ b/.gitpod.dockerfile @@ -4,14 +4,14 @@ ENV HOME=/home/gitpod WORKDIR $HOME USER gitpod -ENV GO_VERSION=1.16.7 \ +ENV GO_VERSION=1.19.0 \ GOPATH=$HOME/go-packages \ GOROOT=$HOME/go RUN export PATH=$(echo "$PATH" | sed -e 's|:/workspace/go/bin||' -e 's|:/home/gitpod/go/bin||' -e 's|:/home/gitpod/go-packages/bin||') ENV PATH=$GOROOT/bin:$GOPATH/bin:$PATH -RUN go get -u -v \ - github.com/cosmtrek/air && \ +RUN go install -v \ + github.com/cosmtrek/air@latest && \ sudo rm -rf $GOPATH/src && \ sudo rm -rf $GOPATH/pkg # user Go packages diff --git a/.goreleaser.yml b/.goreleaser.yml index 77e030cec..724ff56b1 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -31,8 +31,8 @@ builds: - -s -w -X main.version={{.Version}} -X main.commit={{.ShortCommit}} -X main.date={{.Date}} env: - CGO_ENABLED=1 - - CC=o64-clang - - CXX=o64-clang++ + - CC=oa64-clang + - CXX=oa64-clang++ goos: - darwin goarch: @@ -206,6 +206,7 @@ changelog: filters: exclude: - "^docs:" + - "^minor:" - "^test:" release: diff --git a/Makefile b/Makefile index ef9a0e903..4ead1078d 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -GOLANG_CROSS_VERSION ?= v1.17.5 +GORELEASER_CROSS_VERSION ?= v1.19.0 SYSROOT_DIR ?= sysroots SYSROOT_ARCHIVE ?= sysroots.tar.bz2 @@ -21,7 +21,7 @@ release-dry-run-snapshot: -v `pwd`:/go/src \ -v `pwd`/sysroot:/sysroot \ -w /go/src \ - ghcr.io/troian/golang-cross:${GOLANG_CROSS_VERSION} \ + ghcr.io/goreleaser/goreleaser-cross:${GORELEASER_CROSS_VERSION} \ --rm-dist --skip-validate --skip-publish --snapshot .PHONY: release-dry-run @@ -34,7 +34,7 @@ release-dry-run: -v `pwd`:/go/src \ -v `pwd`/sysroot:/sysroot \ -w /go/src \ - ghcr.io/troian/golang-cross:${GOLANG_CROSS_VERSION} \ + ghcr.io/goreleaser/goreleaser-cross:${GORELEASER_CROSS_VERSION} \ --rm-dist --skip-validate --skip-publish .PHONY: release-snapshot @@ -52,7 +52,7 @@ release-snapshot: -v `pwd`:/go/src \ -v `pwd`/sysroot:/sysroot \ -w /go/src \ - ghcr.io/troian/golang-cross:${GOLANG_CROSS_VERSION} \ + ghcr.io/goreleaser/goreleaser-cross:${GORELEASER_CROSS_VERSION} \ release --rm-dist --snapshot .PHONY: release @@ -70,5 +70,5 @@ release: -v `pwd`:/go/src \ -v `pwd`/sysroot:/sysroot \ -w /go/src \ - ghcr.io/troian/golang-cross:${GOLANG_CROSS_VERSION} \ + ghcr.io/goreleaser/goreleaser-cross:${GORELEASER_CROSS_VERSION} \ release --rm-dist