From e40dc2ea8ee0c167df3f3781e8a69bc8a1449b7f Mon Sep 17 00:00:00 2001 From: Will Roden Date: Fri, 20 Aug 2021 11:21:03 -0500 Subject: [PATCH] test with go 1.17 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/fuzz.yml | 2 +- Makefile | 2 +- script/fuzz | 2 +- script/fuzz-timeout | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 085e659d..69079901 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: - uses: WillAbides/setup-go-faster@v1 id: setup-go with: - go-version: '1.15.x' + go-version: '1.17' - uses: actions/cache@v2 with: path: | @@ -31,7 +31,7 @@ jobs: - uses: WillAbides/setup-go-faster@v1 id: setup-go with: - go-version: '1.15.x' + go-version: '1.17' - uses: WillAbides/benchdiff-action@v0.3.3 id: benchdiff with: diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml index 9b47cee6..59f2c18b 100644 --- a/.github/workflows/fuzz.yml +++ b/.github/workflows/fuzz.yml @@ -14,7 +14,7 @@ jobs: - uses: WillAbides/setup-go-faster@v1 id: setup-go with: - go-version: '1.16.x' + go-version: '1.17' - uses: actions/cache@v2 with: path: | diff --git a/Makefile b/Makefile index afbd2484..afc7031c 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ bin/gofumpt: bin/gobin GOBIN=${CURDIR}/bin \ bin/gobin mvdan.cc/gofumpt@$(GOFUMPT_REV) -GO_FUZZ_REV := 6a8e9d1f2415cf672ddbe864c2d4092287b33a21 +GO_FUZZ_REV := b1f3d6f4ef4e0fab65fa66f9191e6b115ad34f31 bin/go-fuzz-build: bin/gobin GOBIN=${CURDIR}/bin \ go install github.com/dvyukov/go-fuzz/go-fuzz-build@$(GO_FUZZ_REV) diff --git a/script/fuzz b/script/fuzz index b3602898..a477762f 100755 --- a/script/fuzz +++ b/script/fuzz @@ -11,7 +11,7 @@ mkdir -p tmp # make a list of all dependencies outside of this repo so they won't be instrumented by go-fuzz preservers="$(go list -f '{{ join .Deps "\n" }}' | grep -v rjson | tr '\n' ',')" -go get github.com/dvyukov/go-fuzz@6a8e9d1f241 +go get github.com/dvyukov/go-fuzz@b1f3d6f4ef4e0fab65fa66f9191e6b115ad34f31 trap "go mod tidy" EXIT go-fuzz-build -o tmp/fuzz-rjson.zip -preserve "$preservers" diff --git a/script/fuzz-timeout b/script/fuzz-timeout index 3e932510..8640c03a 100755 --- a/script/fuzz-timeout +++ b/script/fuzz-timeout @@ -16,7 +16,7 @@ PATH="$(pwd)/bin:$PATH" mkdir -p tmp -go get github.com/dvyukov/go-fuzz@6a8e9d1f241 +go get github.com/dvyukov/go-fuzz@b1f3d6f4ef4e0fab65fa66f9191e6b115ad34f31 trap "go mod tidy" EXIT go-fuzz-build -o tmp/fuzz-rjson.zip