From a6594b33ca72ffde98b9b722f9b61d8c245cb0d9 Mon Sep 17 00:00:00 2001 From: chris erway Date: Mon, 22 Aug 2022 10:46:16 -0400 Subject: [PATCH 01/19] use Go module caching (in setup-go@v3) and libsodium build caching --- .github/workflows/build.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 825056b1e1..9bc4b83ad9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,13 +14,19 @@ jobs: update: true path-type: inherit - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: Install golang - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: go-version: '1.17.9' + - name: Restore libsodium from cache + id: cache-libsodium + uses: actions/cache@v3 + with: + path: crypto/libs + key: libsodium-fork-v2-${{ runner.os }}-${{ hashFiles('crypto/libsodium-fork/**') }} - name: Build Test run: | export ALGORAND_DEADLOCK=enable From ede48a5b60628fb1f14b039c8144b72589205537 Mon Sep 17 00:00:00 2001 From: chris erway Date: Mon, 22 Aug 2022 11:16:36 -0400 Subject: [PATCH 02/19] noop commit to trigger rebuild and use cache --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9bc4b83ad9..2018829819 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: with: path: crypto/libs key: libsodium-fork-v2-${{ runner.os }}-${{ hashFiles('crypto/libsodium-fork/**') }} - - name: Build Test + - name: Build run: | export ALGORAND_DEADLOCK=enable export SKIP_GO_INSTALLATION=True From 226a3fe3a8be8622d13aab84e221fc3a771f79f7 Mon Sep 17 00:00:00 2001 From: chris erway Date: Mon, 22 Aug 2022 11:50:44 -0400 Subject: [PATCH 03/19] downgrade to setup-go@v2 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2018829819..5a7e5f6d89 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: with: fetch-depth: 0 - name: Install golang - uses: actions/setup-go@v3 + uses: actions/setup-go@v2 with: go-version: '1.17.9' - name: Restore libsodium from cache From 9a454565ee3298ae27c4d3f746c0710b6b0bad28 Mon Sep 17 00:00:00 2001 From: chris erway Date: Mon, 22 Aug 2022 12:33:35 -0400 Subject: [PATCH 04/19] try and add go clean -modcache to windows build --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5a7e5f6d89..e879f5be27 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: with: fetch-depth: 0 - name: Install golang - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: go-version: '1.17.9' - name: Restore libsodium from cache @@ -27,6 +27,8 @@ jobs: with: path: crypto/libs key: libsodium-fork-v2-${{ runner.os }}-${{ hashFiles('crypto/libsodium-fork/**') }} + - name: clean go mod cache + run: go clean -modcache - name: Build run: | export ALGORAND_DEADLOCK=enable From 08ae17bc77f0493a462c8ac260e0e6caff655518 Mon Sep 17 00:00:00 2001 From: chris erway Date: Mon, 22 Aug 2022 13:23:06 -0400 Subject: [PATCH 05/19] try go 1.17.13 --- .github/workflows/build.yml | 2 +- go.sum | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e879f5be27..69786b1c73 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: - name: Install golang uses: actions/setup-go@v3 with: - go-version: '1.17.9' + go-version: '1.17.13' - name: Restore libsodium from cache id: cache-libsodium uses: actions/cache@v3 diff --git a/go.sum b/go.sum index 58fbbdb98c..72f4db1cec 100644 --- a/go.sum +++ b/go.sum @@ -20,7 +20,6 @@ github.com/algorand/websocket v1.4.5/go.mod h1:79n6FSZY08yQagHzE/YWZqTPBYfY5wc3I github.com/aws/aws-sdk-go v1.16.5 h1:NVxzZXIuwX828VcJrpNxxWjur1tlOBISdMdDdHIKHcc= github.com/aws/aws-sdk-go v1.16.5/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/chrismcguire/gobberish v0.0.0-20150821175641-1d8adb509a0e h1:CHPYEbz71w8DqJ7DRIq+MXyCQsdibK08vdcQTY4ufas= -github.com/chrismcguire/gobberish v0.0.0-20150821175641-1d8adb509a0e/go.mod h1:6Xhs0ZlsRjXLIiSMLKafbZxML/j30pg9Z1priLuha5s= github.com/consensys/gnark-crypto v0.7.0 h1:rwdy8+ssmLYRqKp+ryRRgQJl/rCq2uv+n83cOydm5UE= github.com/consensys/gnark-crypto v0.7.0/go.mod h1:KPSuJzyxkJA8xZ/+CV47tyqkr9MmpZA3PXivK4VPrVg= github.com/cpuguy83/go-md2man v1.0.8 h1:DwoNytLphI8hzS2Af4D0dfaEaiSq2bN05mEm4R6vf8M= From 4f4d16bbf4ab4985c43cf941c63c0aa0ac3127cc Mon Sep 17 00:00:00 2001 From: chris erway Date: Mon, 22 Aug 2022 16:40:44 -0400 Subject: [PATCH 06/19] try GOPROXY=direct --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 69786b1c73..e1ce0ee3bc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,6 +33,7 @@ jobs: run: | export ALGORAND_DEADLOCK=enable export SKIP_GO_INSTALLATION=True + export GOPROXY=direct scripts/travis/build_test.sh # - name: Upload artifact to Github # uses: actions/upload-artifact@v2 From 6f4cbc235987f4d59017e68ae066a0e117a19d84 Mon Sep 17 00:00:00 2001 From: chris erway Date: Mon, 22 Aug 2022 17:11:57 -0400 Subject: [PATCH 07/19] only add caching, nothing else --- .github/workflows/build.yml | 11 ++++------- go.sum | 1 + 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1ce0ee3bc..d929deed7d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,26 +14,23 @@ jobs: update: true path-type: inherit - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v2 with: fetch-depth: 0 - name: Install golang - uses: actions/setup-go@v3 - with: - go-version: '1.17.13' + uses: actions/setup-go@v2 - name: Restore libsodium from cache id: cache-libsodium uses: actions/cache@v3 with: path: crypto/libs key: libsodium-fork-v2-${{ runner.os }}-${{ hashFiles('crypto/libsodium-fork/**') }} - - name: clean go mod cache - run: go clean -modcache +# - name: clean go mod cache +# run: go clean -modcache - name: Build run: | export ALGORAND_DEADLOCK=enable export SKIP_GO_INSTALLATION=True - export GOPROXY=direct scripts/travis/build_test.sh # - name: Upload artifact to Github # uses: actions/upload-artifact@v2 diff --git a/go.sum b/go.sum index 72f4db1cec..58fbbdb98c 100644 --- a/go.sum +++ b/go.sum @@ -20,6 +20,7 @@ github.com/algorand/websocket v1.4.5/go.mod h1:79n6FSZY08yQagHzE/YWZqTPBYfY5wc3I github.com/aws/aws-sdk-go v1.16.5 h1:NVxzZXIuwX828VcJrpNxxWjur1tlOBISdMdDdHIKHcc= github.com/aws/aws-sdk-go v1.16.5/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/chrismcguire/gobberish v0.0.0-20150821175641-1d8adb509a0e h1:CHPYEbz71w8DqJ7DRIq+MXyCQsdibK08vdcQTY4ufas= +github.com/chrismcguire/gobberish v0.0.0-20150821175641-1d8adb509a0e/go.mod h1:6Xhs0ZlsRjXLIiSMLKafbZxML/j30pg9Z1priLuha5s= github.com/consensys/gnark-crypto v0.7.0 h1:rwdy8+ssmLYRqKp+ryRRgQJl/rCq2uv+n83cOydm5UE= github.com/consensys/gnark-crypto v0.7.0/go.mod h1:KPSuJzyxkJA8xZ/+CV47tyqkr9MmpZA3PXivK4VPrVg= github.com/cpuguy83/go-md2man v1.0.8 h1:DwoNytLphI8hzS2Af4D0dfaEaiSq2bN05mEm4R6vf8M= From c3c2dbf937adea26aec3b7ec91a83bf2cc77adeb Mon Sep 17 00:00:00 2001 From: chris erway Date: Tue, 23 Aug 2022 11:35:20 -0400 Subject: [PATCH 08/19] upgrade go-codec to 1.1.9 and run go mod tidy -compat=1.17 --- .github/workflows/build.yml | 2 -- go.mod | 3 +-- go.sum | 6 ++---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d929deed7d..a6956ce224 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,8 +25,6 @@ jobs: with: path: crypto/libs key: libsodium-fork-v2-${{ runner.os }}-${{ hashFiles('crypto/libsodium-fork/**') }} -# - name: clean go mod cache -# run: go clean -modcache - name: Build run: | export ALGORAND_DEADLOCK=enable diff --git a/go.mod b/go.mod index f20b25dc6d..96858995b5 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/algorand/avm-abi v0.1.0 github.com/algorand/falcon v0.0.0-20220727072124-02a2a64c4414 - github.com/algorand/go-codec/codec v1.1.8 + github.com/algorand/go-codec/codec v1.1.9 github.com/algorand/go-deadlock v0.2.2 github.com/algorand/go-sumhash v0.1.0 github.com/algorand/graphtrace v0.1.0 @@ -39,7 +39,6 @@ require ( ) require ( - github.com/chrismcguire/gobberish v0.0.0-20150821175641-1d8adb509a0e // indirect github.com/cpuguy83/go-md2man v1.0.8 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect diff --git a/go.sum b/go.sum index 58fbbdb98c..f773e574fd 100644 --- a/go.sum +++ b/go.sum @@ -2,9 +2,8 @@ github.com/algorand/avm-abi v0.1.0 h1:znZFQXpSUVYz37vXbaH5OZG2VK4snTyXwnc/tV9CVr github.com/algorand/avm-abi v0.1.0/go.mod h1:+CgwM46dithy850bpTeHh9MC99zpn2Snirb3QTl2O/g= github.com/algorand/falcon v0.0.0-20220727072124-02a2a64c4414 h1:nwYN+GQ7Z5OOfZwqBO1ma7DSlP7S1YrKWICOyjkwqrc= github.com/algorand/falcon v0.0.0-20220727072124-02a2a64c4414/go.mod h1:OkQyHlGvS0kLNcIWbC21/uQcnbfwSOQm+wiqWwBG9pQ= -github.com/algorand/go-codec v1.1.8/go.mod h1:XhzVs6VVyWMLu6cApb9/192gBjGRVGm5cX5j203Heg4= -github.com/algorand/go-codec/codec v1.1.8 h1:lsFuhcOH2LiEhpBH3BVUUkdevVmwCRyvb7FCAAPeY6U= -github.com/algorand/go-codec/codec v1.1.8/go.mod h1:tQ3zAJ6ijTps6V+wp8KsGDnPC2uhHVC7ANyrtkIY0bA= +github.com/algorand/go-codec/codec v1.1.9 h1:el4HFSPZhP+YCgOZxeFGB/BqlNkaUIs55xcALulUTCM= +github.com/algorand/go-codec/codec v1.1.9/go.mod h1:YkEx5nmr/zuCeaDYOIhlDg92Lxju8tj2d2NrYqP7g7k= github.com/algorand/go-deadlock v0.2.2 h1:L7AKATSUCzoeVuOgpTipfCEjdUu5ECmlje8R7lP9DOY= github.com/algorand/go-deadlock v0.2.2/go.mod h1:Hat1OXKqKNUcN/iv74FjGhF4hsOE2l7gOgQ9ZVIq6Fk= github.com/algorand/go-sumhash v0.1.0 h1:b/QRhyLuF//vOcicBIxBXYW8bERNoeLxieht/dUYpVg= @@ -20,7 +19,6 @@ github.com/algorand/websocket v1.4.5/go.mod h1:79n6FSZY08yQagHzE/YWZqTPBYfY5wc3I github.com/aws/aws-sdk-go v1.16.5 h1:NVxzZXIuwX828VcJrpNxxWjur1tlOBISdMdDdHIKHcc= github.com/aws/aws-sdk-go v1.16.5/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/chrismcguire/gobberish v0.0.0-20150821175641-1d8adb509a0e h1:CHPYEbz71w8DqJ7DRIq+MXyCQsdibK08vdcQTY4ufas= -github.com/chrismcguire/gobberish v0.0.0-20150821175641-1d8adb509a0e/go.mod h1:6Xhs0ZlsRjXLIiSMLKafbZxML/j30pg9Z1priLuha5s= github.com/consensys/gnark-crypto v0.7.0 h1:rwdy8+ssmLYRqKp+ryRRgQJl/rCq2uv+n83cOydm5UE= github.com/consensys/gnark-crypto v0.7.0/go.mod h1:KPSuJzyxkJA8xZ/+CV47tyqkr9MmpZA3PXivK4VPrVg= github.com/cpuguy83/go-md2man v1.0.8 h1:DwoNytLphI8hzS2Af4D0dfaEaiSq2bN05mEm4R6vf8M= From dd9a71de4c8e5418a0d027d261a8989439fffb73 Mon Sep 17 00:00:00 2001 From: chris erway Date: Tue, 23 Aug 2022 12:17:52 -0400 Subject: [PATCH 09/19] show GOPROXY --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a6956ce224..3938475983 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,6 +25,7 @@ jobs: with: path: crypto/libs key: libsodium-fork-v2-${{ runner.os }}-${{ hashFiles('crypto/libsodium-fork/**') }} + - run: go env GOPROXY - name: Build run: | export ALGORAND_DEADLOCK=enable From e39fb870d5d42a6b9f21be62f0ad99db9c0b1582 Mon Sep 17 00:00:00 2001 From: chris erway Date: Tue, 23 Aug 2022 13:07:59 -0400 Subject: [PATCH 10/19] emit debugging info --- scripts/travis/before_build.sh | 2 +- scripts/travis/build.sh | 4 ++-- scripts/travis/build_test.sh | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/travis/before_build.sh b/scripts/travis/before_build.sh index 3dbb7339d3..f9cf0601f3 100755 --- a/scripts/travis/before_build.sh +++ b/scripts/travis/before_build.sh @@ -19,7 +19,7 @@ ARCH=$("${SCRIPTPATH}"/../archtype.sh) if [ ! -f crypto/libs/${OS}/${ARCH}/lib/libsodium.a ]; then echo "Building libsodium-fork..." - make crypto/libs/${OS}/${ARCH}/lib/libsodium.a + make -d crypto/libs/${OS}/${ARCH}/lib/libsodium.a fi diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh index 3087f63d75..5ab34fd72b 100755 --- a/scripts/travis/build.sh +++ b/scripts/travis/build.sh @@ -82,9 +82,9 @@ if [ "${OS}-${ARCH}" = "linux-arm" ] || [ "${OS}-${ARCH}" = "windows-amd64" ]; t fi if [ "${MAKE_DEBUG_OPTION}" != "" ]; then - make build build-race + make -d build build-race duration "make build build-race" else - make build + make -d build duration "make build" fi diff --git a/scripts/travis/build_test.sh b/scripts/travis/build_test.sh index 54e95a5037..86f6eb3048 100755 --- a/scripts/travis/build_test.sh +++ b/scripts/travis/build_test.sh @@ -8,6 +8,7 @@ # # Examples: scripts/travis/build_test.sh set -e +set -x ALGORAND_DEADLOCK=enable export ALGORAND_DEADLOCK From 4af216e4edecefb70032d1632fe1fba2745aa727 Mon Sep 17 00:00:00 2001 From: chris erway Date: Tue, 23 Aug 2022 13:28:27 -0400 Subject: [PATCH 11/19] mod download before build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3938475983..40448cd86d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: with: path: crypto/libs key: libsodium-fork-v2-${{ runner.os }}-${{ hashFiles('crypto/libsodium-fork/**') }} - - run: go env GOPROXY + - run: GOPROXY=direct go mod download - name: Build run: | export ALGORAND_DEADLOCK=enable From e9c54a8dd4a3545006af905ddba70ec747998c76 Mon Sep 17 00:00:00 2001 From: chris erway Date: Tue, 23 Aug 2022 15:23:09 -0400 Subject: [PATCH 12/19] clean modcache --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 40448cd86d..adeb6d562e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,9 @@ jobs: with: path: crypto/libs key: libsodium-fork-v2-${{ runner.os }}-${{ hashFiles('crypto/libsodium-fork/**') }} - - run: GOPROXY=direct go mod download + - run: | + go clean -modcache + GOPROXY=direct go mod download - name: Build run: | export ALGORAND_DEADLOCK=enable From a41a2c6f19fadb9f26a329f47d22f2e857cb0dcd Mon Sep 17 00:00:00 2001 From: chris erway Date: Tue, 23 Aug 2022 15:53:56 -0400 Subject: [PATCH 13/19] use proxy.golang.org --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index adeb6d562e..a74feb31dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: key: libsodium-fork-v2-${{ runner.os }}-${{ hashFiles('crypto/libsodium-fork/**') }} - run: | go clean -modcache - GOPROXY=direct go mod download + GOPROXY=https://proxy.golang.org go mod download - name: Build run: | export ALGORAND_DEADLOCK=enable From 2d90c9c339e185e2a65d8a8e36b2007a960e9afd Mon Sep 17 00:00:00 2001 From: chris erway Date: Tue, 23 Aug 2022 18:03:54 -0400 Subject: [PATCH 14/19] get rid of GOPROXY=direct --- .github/workflows/build.yml | 3 --- Makefile | 1 - 2 files changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a74feb31dc..a6956ce224 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,9 +25,6 @@ jobs: with: path: crypto/libs key: libsodium-fork-v2-${{ runner.os }}-${{ hashFiles('crypto/libsodium-fork/**') }} - - run: | - go clean -modcache - GOPROXY=https://proxy.golang.org go mod download - name: Build run: | export ALGORAND_DEADLOCK=enable diff --git a/Makefile b/Makefile index 4c6cef5fd5..b7fde90002 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,6 @@ else export GOPATH := $(shell go env GOPATH) GOPATH1 := $(firstword $(subst :, ,$(GOPATH))) endif -export GOPROXY := direct SRCPATH := $(shell pwd) ARCH := $(shell ./scripts/archtype.sh) OS_TYPE := $(shell ./scripts/ostype.sh) From d3f8984ddedbafb4a85b16277fa70d2e0bd180dd Mon Sep 17 00:00:00 2001 From: chris erway Date: Tue, 23 Aug 2022 18:20:03 -0400 Subject: [PATCH 15/19] Revert "emit debugging info" This reverts commit e39fb870d5d42a6b9f21be62f0ad99db9c0b1582. --- scripts/travis/before_build.sh | 2 +- scripts/travis/build.sh | 4 ++-- scripts/travis/build_test.sh | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/travis/before_build.sh b/scripts/travis/before_build.sh index f9cf0601f3..3dbb7339d3 100755 --- a/scripts/travis/before_build.sh +++ b/scripts/travis/before_build.sh @@ -19,7 +19,7 @@ ARCH=$("${SCRIPTPATH}"/../archtype.sh) if [ ! -f crypto/libs/${OS}/${ARCH}/lib/libsodium.a ]; then echo "Building libsodium-fork..." - make -d crypto/libs/${OS}/${ARCH}/lib/libsodium.a + make crypto/libs/${OS}/${ARCH}/lib/libsodium.a fi diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh index 5ab34fd72b..3087f63d75 100755 --- a/scripts/travis/build.sh +++ b/scripts/travis/build.sh @@ -82,9 +82,9 @@ if [ "${OS}-${ARCH}" = "linux-arm" ] || [ "${OS}-${ARCH}" = "windows-amd64" ]; t fi if [ "${MAKE_DEBUG_OPTION}" != "" ]; then - make -d build build-race + make build build-race duration "make build build-race" else - make -d build + make build duration "make build" fi diff --git a/scripts/travis/build_test.sh b/scripts/travis/build_test.sh index 86f6eb3048..54e95a5037 100755 --- a/scripts/travis/build_test.sh +++ b/scripts/travis/build_test.sh @@ -8,7 +8,6 @@ # # Examples: scripts/travis/build_test.sh set -e -set -x ALGORAND_DEADLOCK=enable export ALGORAND_DEADLOCK From bc591ab1c68126df740690e0492179735c176e89 Mon Sep 17 00:00:00 2001 From: chris erway Date: Tue, 23 Aug 2022 22:58:53 -0400 Subject: [PATCH 16/19] Revert "upgrade go-codec to 1.1.9 and run go mod tidy -compat=1.17" This reverts commit c3c2dbf937adea26aec3b7ec91a83bf2cc77adeb. --- .github/workflows/build.yml | 2 ++ go.mod | 3 ++- go.sum | 6 ++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a6956ce224..d929deed7d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,6 +25,8 @@ jobs: with: path: crypto/libs key: libsodium-fork-v2-${{ runner.os }}-${{ hashFiles('crypto/libsodium-fork/**') }} +# - name: clean go mod cache +# run: go clean -modcache - name: Build run: | export ALGORAND_DEADLOCK=enable diff --git a/go.mod b/go.mod index 96858995b5..f20b25dc6d 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/algorand/avm-abi v0.1.0 github.com/algorand/falcon v0.0.0-20220727072124-02a2a64c4414 - github.com/algorand/go-codec/codec v1.1.9 + github.com/algorand/go-codec/codec v1.1.8 github.com/algorand/go-deadlock v0.2.2 github.com/algorand/go-sumhash v0.1.0 github.com/algorand/graphtrace v0.1.0 @@ -39,6 +39,7 @@ require ( ) require ( + github.com/chrismcguire/gobberish v0.0.0-20150821175641-1d8adb509a0e // indirect github.com/cpuguy83/go-md2man v1.0.8 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect diff --git a/go.sum b/go.sum index f773e574fd..58fbbdb98c 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,9 @@ github.com/algorand/avm-abi v0.1.0 h1:znZFQXpSUVYz37vXbaH5OZG2VK4snTyXwnc/tV9CVr github.com/algorand/avm-abi v0.1.0/go.mod h1:+CgwM46dithy850bpTeHh9MC99zpn2Snirb3QTl2O/g= github.com/algorand/falcon v0.0.0-20220727072124-02a2a64c4414 h1:nwYN+GQ7Z5OOfZwqBO1ma7DSlP7S1YrKWICOyjkwqrc= github.com/algorand/falcon v0.0.0-20220727072124-02a2a64c4414/go.mod h1:OkQyHlGvS0kLNcIWbC21/uQcnbfwSOQm+wiqWwBG9pQ= -github.com/algorand/go-codec/codec v1.1.9 h1:el4HFSPZhP+YCgOZxeFGB/BqlNkaUIs55xcALulUTCM= -github.com/algorand/go-codec/codec v1.1.9/go.mod h1:YkEx5nmr/zuCeaDYOIhlDg92Lxju8tj2d2NrYqP7g7k= +github.com/algorand/go-codec v1.1.8/go.mod h1:XhzVs6VVyWMLu6cApb9/192gBjGRVGm5cX5j203Heg4= +github.com/algorand/go-codec/codec v1.1.8 h1:lsFuhcOH2LiEhpBH3BVUUkdevVmwCRyvb7FCAAPeY6U= +github.com/algorand/go-codec/codec v1.1.8/go.mod h1:tQ3zAJ6ijTps6V+wp8KsGDnPC2uhHVC7ANyrtkIY0bA= github.com/algorand/go-deadlock v0.2.2 h1:L7AKATSUCzoeVuOgpTipfCEjdUu5ECmlje8R7lP9DOY= github.com/algorand/go-deadlock v0.2.2/go.mod h1:Hat1OXKqKNUcN/iv74FjGhF4hsOE2l7gOgQ9ZVIq6Fk= github.com/algorand/go-sumhash v0.1.0 h1:b/QRhyLuF//vOcicBIxBXYW8bERNoeLxieht/dUYpVg= @@ -19,6 +20,7 @@ github.com/algorand/websocket v1.4.5/go.mod h1:79n6FSZY08yQagHzE/YWZqTPBYfY5wc3I github.com/aws/aws-sdk-go v1.16.5 h1:NVxzZXIuwX828VcJrpNxxWjur1tlOBISdMdDdHIKHcc= github.com/aws/aws-sdk-go v1.16.5/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/chrismcguire/gobberish v0.0.0-20150821175641-1d8adb509a0e h1:CHPYEbz71w8DqJ7DRIq+MXyCQsdibK08vdcQTY4ufas= +github.com/chrismcguire/gobberish v0.0.0-20150821175641-1d8adb509a0e/go.mod h1:6Xhs0ZlsRjXLIiSMLKafbZxML/j30pg9Z1priLuha5s= github.com/consensys/gnark-crypto v0.7.0 h1:rwdy8+ssmLYRqKp+ryRRgQJl/rCq2uv+n83cOydm5UE= github.com/consensys/gnark-crypto v0.7.0/go.mod h1:KPSuJzyxkJA8xZ/+CV47tyqkr9MmpZA3PXivK4VPrVg= github.com/cpuguy83/go-md2man v1.0.8 h1:DwoNytLphI8hzS2Af4D0dfaEaiSq2bN05mEm4R6vf8M= From c9abda51568113a7253baf162c01bb3bcc42c225 Mon Sep 17 00:00:00 2001 From: chris erway Date: Tue, 23 Aug 2022 23:01:58 -0400 Subject: [PATCH 17/19] update setup-go again --- .github/workflows/build.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d929deed7d..b2146fbef8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,19 +14,17 @@ jobs: update: true path-type: inherit - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: Install golang - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 - name: Restore libsodium from cache id: cache-libsodium uses: actions/cache@v3 with: path: crypto/libs key: libsodium-fork-v2-${{ runner.os }}-${{ hashFiles('crypto/libsodium-fork/**') }} -# - name: clean go mod cache -# run: go clean -modcache - name: Build run: | export ALGORAND_DEADLOCK=enable From 9dc251833d308dfc0de6dbeb3d9a6e46e349ba7e Mon Sep 17 00:00:00 2001 From: chris erway Date: Tue, 23 Aug 2022 23:03:05 -0400 Subject: [PATCH 18/19] rename workflow --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b2146fbef8..e5bcf7134d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,8 +1,8 @@ -name: "Build workflow" +name: "Build Windows" on: pull_request: jobs: - build-test-windows: + build-windows: runs-on: windows-2022 defaults: run: From e2c7faecd3d2e449fd61247d43155c573f699a4c Mon Sep 17 00:00:00 2001 From: chris erway Date: Wed, 24 Aug 2022 10:47:30 -0400 Subject: [PATCH 19/19] upgrade to 1.17.13 --- .circleci/config.yml | 6 +++--- .github/workflows/build.yml | 2 ++ .github/workflows/reviewdog.yml | 2 +- scripts/get_golang_version.sh | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d4f9805b7b..ed53d2eacf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -201,7 +201,7 @@ commands: shell: bash.exe command: | choco install -y msys2 pacman make wget --force - choco install -y golang --version=1.17.9 --force + choco install -y golang --version=1.17.13 --force choco install -y python3 --version=3.7.3 --force export msys2='cmd //C RefreshEnv.cmd ' export msys2+='& set MSYS=winsymlinks:nativestrict ' @@ -228,7 +228,7 @@ commands: - restore_libsodium - restore_cache: keys: - - 'go-mod-1.17.9-v3-{{ arch }}-{{ checksum "go.mod" }}-{{ checksum "go.sum" }}' + - 'go-mod-1.17.13-v3-{{ arch }}-{{ checksum "go.mod" }}-{{ checksum "go.sum" }}' - restore_cache: keys: - 'go-cache-v3-{{ arch }}-{{ .Branch }}-{{ .Revision }}' @@ -246,7 +246,7 @@ commands: scripts/travis/build.sh --make_debug - cache_libsodium - save_cache: - key: 'go-mod-1.17.9-v3-{{ arch }}-{{ checksum "go.mod" }}-{{ checksum "go.sum" }}' + key: 'go-mod-1.17.13-v3-{{ arch }}-{{ checksum "go.mod" }}-{{ checksum "go.sum" }}' paths: - << parameters.build_dir >>/go/pkg/mod - save_cache: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e5bcf7134d..3936f76c22 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,8 @@ jobs: fetch-depth: 0 - name: Install golang uses: actions/setup-go@v3 + with: + go-version: "1.17.13" - name: Restore libsodium from cache id: cache-libsodium uses: actions/cache@v3 diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml index f84732e3d8..52ec1fa9b3 100644 --- a/.github/workflows/reviewdog.yml +++ b/.github/workflows/reviewdog.yml @@ -45,7 +45,7 @@ jobs: - name: Install specific golang uses: actions/setup-go@v2 with: - go-version: '1.17.9' + go-version: '1.17.13' - name: Create folders for golangci-lint run: mkdir -p cicdtmp/golangci-lint - name: Check if custom golangci-lint is already built diff --git a/scripts/get_golang_version.sh b/scripts/get_golang_version.sh index 390847ed4d..4e3525a548 100755 --- a/scripts/get_golang_version.sh +++ b/scripts/get_golang_version.sh @@ -11,7 +11,7 @@ # Our build task-runner `mule` will refer to this script and will automatically # build a new image whenever the version number has been changed. -BUILD=1.17.9 +BUILD=1.17.13 MIN=1.17 GO_MOD_SUPPORT=1.17