Skip to content

Commit fb93b38

Browse files
web3-botrvagg
andauthored
sync: update CI config files (#378)
* bump go.mod to Go 1.19 and run go fix * bump go.mod to Go 1.19 and run go fix * update .github/workflows/go-test.yml * update .github/workflows/go-check.yml * update .github/workflows/release-check.yml * fix: replace math/rand#Read with crypto/rand#Read --------- Co-authored-by: web3-bot <web3-bot@users.noreply.github.com> Co-authored-by: Rod Vagg <rod@vagg.org>
1 parent 46b86a2 commit fb93b38

7 files changed

Lines changed: 34 additions & 28 deletions

File tree

.github/workflows/go-check.yml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,20 @@ jobs:
88
unit:
99
runs-on: ubuntu-latest
1010
name: All
11-
env:
12-
RUNGOGENERATE: false
1311
steps:
1412
- uses: actions/checkout@v3
1513
with:
1614
submodules: recursive
15+
- id: config
16+
uses: protocol/.github/.github/actions/read-config@master
1717
- uses: actions/setup-go@v3
1818
with:
19-
go-version: "1.19.x"
19+
go-version: 1.20.x
2020
- name: Run repo-specific setup
2121
uses: ./.github/actions/go-check-setup
2222
if: hashFiles('./.github/actions/go-check-setup') != ''
23-
- name: Read config
24-
if: hashFiles('./.github/workflows/go-check-config.json') != ''
25-
run: |
26-
if jq -re .gogenerate ./.github/workflows/go-check-config.json; then
27-
echo "RUNGOGENERATE=true" >> $GITHUB_ENV
28-
fi
2923
- name: Install staticcheck
30-
run: go install honnef.co/go/tools/cmd/staticcheck@376210a89477dedbe6fdc4484b233998650d7b3c # 2022.1.3 (v0.3.3)
24+
run: go install honnef.co/go/tools/cmd/staticcheck@4970552d932f48b71485287748246cf3237cebdf # 2023.1 (v0.4.0)
3125
- name: Check that go.mod is tidy
3226
uses: protocol/multiple-go-modules@v1.2
3327
with:
@@ -39,32 +33,32 @@ jobs:
3933
fi
4034
git diff --exit-code -- go.sum go.mod
4135
- name: gofmt
42-
if: ${{ success() || failure() }} # run this step even if the previous one failed
36+
if: success() || failure() # run this step even if the previous one failed
4337
run: |
4438
out=$(gofmt -s -l .)
4539
if [[ -n "$out" ]]; then
4640
echo $out | awk '{print "::error file=" $0 ",line=0,col=0::File is not gofmt-ed."}'
4741
exit 1
4842
fi
4943
- name: go vet
50-
if: ${{ success() || failure() }} # run this step even if the previous one failed
44+
if: success() || failure() # run this step even if the previous one failed
5145
uses: protocol/multiple-go-modules@v1.2
5246
with:
5347
run: go vet ./...
5448
- name: staticcheck
55-
if: ${{ success() || failure() }} # run this step even if the previous one failed
49+
if: success() || failure() # run this step even if the previous one failed
5650
uses: protocol/multiple-go-modules@v1.2
5751
with:
5852
run: |
5953
set -o pipefail
6054
staticcheck ./... | sed -e 's@\(.*\)\.go@./\1.go@g'
6155
- name: go generate
6256
uses: protocol/multiple-go-modules@v1.2
63-
if: (success() || failure()) && env.RUNGOGENERATE == 'true'
57+
if: (success() || failure()) && fromJSON(steps.config.outputs.json).gogenerate == true
6458
with:
6559
run: |
6660
git clean -fd # make sure there aren't untracked files / directories
67-
go generate ./...
61+
go generate -x ./...
6862
# check if go generate modified or added any files
6963
if ! $(git add . && git diff-index HEAD --exit-code --quiet); then
7064
echo "go generated caused changes to the repository:"

.github/workflows/go-test.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,17 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
os: [ "ubuntu", "windows", "macos" ]
13-
go: [ "1.18.x", "1.19.x" ]
13+
go: ["1.19.x","1.20.x"]
1414
env:
1515
COVERAGES: ""
16-
runs-on: ${{ format('{0}-latest', matrix.os) }}
16+
runs-on: ${{ fromJSON(vars[format('UCI_GO_TEST_RUNNER_{0}', matrix.os)] || format('"{0}-latest"', matrix.os)) }}
1717
name: ${{ matrix.os }} (go ${{ matrix.go }})
1818
steps:
1919
- uses: actions/checkout@v3
2020
with:
2121
submodules: recursive
22+
- id: config
23+
uses: protocol/.github/.github/actions/read-config@master
2224
- uses: actions/setup-go@v3
2325
with:
2426
go-version: ${{ matrix.go }}
@@ -27,7 +29,7 @@ jobs:
2729
go version
2830
go env
2931
- name: Use msys2 on windows
30-
if: ${{ matrix.os == 'windows' }}
32+
if: matrix.os == 'windows'
3133
shell: bash
3234
# The executable for msys2 is also called bash.cmd
3335
# https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md#shells
@@ -38,31 +40,37 @@ jobs:
3840
uses: ./.github/actions/go-test-setup
3941
if: hashFiles('./.github/actions/go-test-setup') != ''
4042
- name: Run tests
43+
if: contains(fromJSON(steps.config.outputs.json).skipOSes, matrix.os) == false
4144
uses: protocol/multiple-go-modules@v1.2
4245
with:
4346
# Use -coverpkg=./..., so that we include cross-package coverage.
4447
# If package ./A imports ./B, and ./A's tests also cover ./B,
4548
# this means ./B's coverage will be significantly higher than 0%.
4649
run: go test -v -shuffle=on -coverprofile=module-coverage.txt -coverpkg=./... ./...
4750
- name: Run tests (32 bit)
48-
if: ${{ matrix.os != 'macos' }} # can't run 32 bit tests on OSX.
51+
# can't run 32 bit tests on OSX.
52+
if: matrix.os != 'macos' &&
53+
fromJSON(steps.config.outputs.json).skip32bit != true &&
54+
contains(fromJSON(steps.config.outputs.json).skipOSes, matrix.os) == false
4955
uses: protocol/multiple-go-modules@v1.2
5056
env:
5157
GOARCH: 386
5258
with:
5359
run: |
54-
export "PATH=${{ env.PATH_386 }}:$PATH"
60+
export "PATH=$PATH_386:$PATH"
5561
go test -v -shuffle=on ./...
5662
- name: Run tests with race detector
57-
if: ${{ matrix.os == 'ubuntu' }} # speed things up. Windows and OSX VMs are slow
63+
# speed things up. Windows and OSX VMs are slow
64+
if: matrix.os == 'ubuntu' &&
65+
contains(fromJSON(steps.config.outputs.json).skipOSes, matrix.os) == false
5866
uses: protocol/multiple-go-modules@v1.2
5967
with:
6068
run: go test -v -race ./...
6169
- name: Collect coverage files
6270
shell: bash
6371
run: echo "COVERAGES=$(find . -type f -name 'module-coverage.txt' | tr -s '\n' ',' | sed 's/,$//')" >> $GITHUB_ENV
6472
- name: Upload coverage to Codecov
65-
uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
73+
uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
6674
with:
6775
files: '${{ env.COVERAGES }}'
6876
env_vars: OS=${{ matrix.os }}, GO=${{ matrix.go }}

.github/workflows/release-check.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33

44
name: Release Checker
55
on:
6-
pull_request:
6+
pull_request_target:
77
paths: [ 'version.json' ]
88

99
jobs:
1010
release-check:
1111
uses: protocol/.github/.github/workflows/release-check.yml@master
12+
with:
13+
go-version: 1.20.x

benchmarks/benchmark_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package graphsync_test
33
import (
44
"bytes"
55
"context"
6+
crand "crypto/rand"
67
"fmt"
78
"math/rand"
89
"os"
@@ -264,7 +265,7 @@ const defaultUnixfsLinksPerLevel = 1024
264265
func loadRandomUnixFxFile(ctx context.Context, b *testing.B, bs blockstore.Blockstore, size uint64, unixfsChunkSize uint64, unixfsLinksPerLevel int, useRawNodes bool) cid.Cid {
265266

266267
data := make([]byte, size)
267-
_, err := rand.Read(data)
268+
_, err := crand.Read(data)
268269
require.NoError(b, err)
269270
buf := bytes.NewReader(data)
270271
file := files.NewReaderFile(buf)

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/ipfs/go-graphsync
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/google/go-cmp v0.5.9

responsemanager/queryexecutor/queryexecutor_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package queryexecutor
33
import (
44
"bytes"
55
"context"
6+
crand "crypto/rand"
67
"fmt"
78
"io"
89
"math/rand"
@@ -220,15 +221,15 @@ func TestSmallGraphTask(t *testing.T) {
220221

221222
func newRandomBlock(index int64) *blockData {
222223
digest := make([]byte, 32)
223-
_, err := rand.Read(digest)
224+
_, err := crand.Read(digest)
224225
if err != nil {
225226
panic(err)
226227
}
227228
mh, _ := multihash.Encode(digest, multihash.SHA2_256)
228229
c := cid.NewCidV1(cid.DagCBOR, mh)
229230
link := &cidlink.Link{Cid: c}
230231
data := make([]byte, rand.Intn(64)+1)
231-
_, err = rand.Read(data)
232+
_, err = crand.Read(data)
232233
if err != nil {
233234
panic(err)
234235
}

testplans/graphsync/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/ipfs/go-graphsync/testplans/graphsync
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/dgraph-io/badger/v2 v2.2007.3

0 commit comments

Comments
 (0)