Skip to content

Commit ee6647c

Browse files
rvaggrvagg
committed
chore!: [email protected], update deps, uci, remove gx
1 parent ffa6dd1 commit ee6647c

File tree

9 files changed

+90
-178
lines changed

9 files changed

+90
-178
lines changed

‎.github/workflows/automerge.yml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.github/workflows/go-check.yml‎

Lines changed: 15 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,18 @@
1-
# File managed by web3-bot. DO NOT EDIT.
2-
# See https://github.com/protocol/.github/ for details.
3-
4-
on: [push, pull_request]
51
name: Go Checks
62

3+
on:
4+
pull_request:
5+
push:
6+
branches: ["main"]
7+
workflow_dispatch:
8+
9+
permissions:
10+
contents: read
11+
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event_name == 'push' && github.sha || github.ref }}
14+
cancel-in-progress: true
15+
716
jobs:
8-
unit:
9-
runs-on: ubuntu-latest
10-
name: All
11-
env:
12-
RUNGOGENERATE: false
13-
steps:
14-
- uses: actions/checkout@v3
15-
with:
16-
submodules: recursive
17-
- uses: actions/setup-go@v3
18-
with:
19-
go-version: "1.19.x"
20-
- name: Run repo-specific setup
21-
uses: ./.github/actions/go-check-setup
22-
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
29-
- name: Install staticcheck
30-
run: go install honnef.co/go/tools/cmd/staticcheck@376210a89477dedbe6fdc4484b233998650d7b3c # 2022.1.3 (v0.3.3)
31-
- name: Check that go.mod is tidy
32-
uses: protocol/[email protected]
33-
with:
34-
run: |
35-
go mod tidy
36-
if [[ -n $(git ls-files --other --exclude-standard --directory -- go.sum) ]]; then
37-
echo "go.sum was added by go mod tidy"
38-
exit 1
39-
fi
40-
git diff --exit-code -- go.sum go.mod
41-
- name: gofmt
42-
if: ${{ success() || failure() }} # run this step even if the previous one failed
43-
run: |
44-
out=$(gofmt -s -l .)
45-
if [[ -n "$out" ]]; then
46-
echo $out | awk '{print "::error file=" $0 ",line=0,col=0::File is not gofmt-ed."}'
47-
exit 1
48-
fi
49-
- name: go vet
50-
if: ${{ success() || failure() }} # run this step even if the previous one failed
51-
uses: protocol/[email protected]
52-
with:
53-
run: go vet ./...
54-
- name: staticcheck
55-
if: ${{ success() || failure() }} # run this step even if the previous one failed
56-
uses: protocol/[email protected]
57-
with:
58-
run: |
59-
set -o pipefail
60-
staticcheck ./... | sed -e 's@\(.*\)\.go@./\1.go@g'
61-
- name: go generate
62-
uses: protocol/[email protected]
63-
if: (success() || failure()) && env.RUNGOGENERATE == 'true'
64-
with:
65-
run: |
66-
git clean -fd # make sure there aren't untracked files / directories
67-
go generate ./...
68-
# check if go generate modified or added any files
69-
if ! $(git add . && git diff-index HEAD --exit-code --quiet); then
70-
echo "go generated caused changes to the repository:"
71-
git status --short
72-
exit 1
73-
fi
17+
go-check:
18+
uses: pl-strflt/uci/.github/workflows/[email protected]

‎.github/workflows/go-test.yml‎

Lines changed: 15 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,18 @@
1-
# File managed by web3-bot. DO NOT EDIT.
2-
# See https://github.com/protocol/.github/ for details.
3-
4-
on: [push, pull_request]
51
name: Go Test
62

3+
on:
4+
pull_request:
5+
push:
6+
branches: ["main"]
7+
workflow_dispatch:
8+
9+
permissions:
10+
contents: read
11+
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event_name == 'push' && github.sha || github.ref }}
14+
cancel-in-progress: true
15+
716
jobs:
8-
unit:
9-
strategy:
10-
fail-fast: false
11-
matrix:
12-
os: [ "ubuntu", "windows", "macos" ]
13-
go: [ "1.18.x", "1.19.x" ]
14-
env:
15-
COVERAGES: ""
16-
runs-on: ${{ format('{0}-latest', matrix.os) }}
17-
name: ${{ matrix.os }} (go ${{ matrix.go }})
18-
steps:
19-
- uses: actions/checkout@v3
20-
with:
21-
submodules: recursive
22-
- uses: actions/setup-go@v3
23-
with:
24-
go-version: ${{ matrix.go }}
25-
- name: Go information
26-
run: |
27-
go version
28-
go env
29-
- name: Use msys2 on windows
30-
if: ${{ matrix.os == 'windows' }}
31-
shell: bash
32-
# The executable for msys2 is also called bash.cmd
33-
# https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md#shells
34-
# If we prepend its location to the PATH
35-
# subsequent 'shell: bash' steps will use msys2 instead of gitbash
36-
run: echo "C:/msys64/usr/bin" >> $GITHUB_PATH
37-
- name: Run repo-specific setup
38-
uses: ./.github/actions/go-test-setup
39-
if: hashFiles('./.github/actions/go-test-setup') != ''
40-
- name: Run tests
41-
uses: protocol/[email protected]
42-
with:
43-
# Use -coverpkg=./..., so that we include cross-package coverage.
44-
# If package ./A imports ./B, and ./A's tests also cover ./B,
45-
# this means ./B's coverage will be significantly higher than 0%.
46-
run: go test -v -shuffle=on -coverprofile=module-coverage.txt -coverpkg=./... ./...
47-
- name: Run tests (32 bit)
48-
if: ${{ matrix.os != 'macos' }} # can't run 32 bit tests on OSX.
49-
uses: protocol/[email protected]
50-
env:
51-
GOARCH: 386
52-
with:
53-
run: |
54-
export "PATH=${{ env.PATH_386 }}:$PATH"
55-
go test -v -shuffle=on ./...
56-
- name: Run tests with race detector
57-
if: ${{ matrix.os == 'ubuntu' }} # speed things up. Windows and OSX VMs are slow
58-
uses: protocol/[email protected]
59-
with:
60-
run: go test -v -race ./...
61-
- name: Collect coverage files
62-
shell: bash
63-
run: echo "COVERAGES=$(find . -type f -name 'module-coverage.txt' | tr -s '\n' ',' | sed 's/,$//')" >> $GITHUB_ENV
64-
- name: Upload coverage to Codecov
65-
uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
66-
with:
67-
files: '${{ env.COVERAGES }}'
68-
env_vars: OS=${{ matrix.os }}, GO=${{ matrix.go }}
17+
go-test:
18+
uses: pl-strflt/uci/.github/workflows/[email protected]

‎.github/workflows/release-check.yml‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
# File managed by web3-bot. DO NOT EDIT.
2-
# See https://github.com/protocol/.github/ for details.
3-
41
name: Release Checker
2+
53
on:
6-
pull_request:
4+
pull_request_target:
75
paths: [ 'version.json' ]
6+
types: [ opened, synchronize, reopened, labeled, unlabeled ]
7+
workflow_dispatch:
8+
9+
permissions:
10+
contents: write
11+
pull-requests: write
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
816

917
jobs:
1018
release-check:
11-
uses: protocol/.github/.github/workflows/release-check.yml@master
19+
uses: pl-strflt/uci/.github/workflows/release-check.yml@v0.0

‎.github/workflows/releaser.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
# File managed by web3-bot. DO NOT EDIT.
2-
# See https://github.com/protocol/.github/ for details.
3-
41
name: Releaser
2+
53
on:
64
push:
75
paths: [ 'version.json' ]
6+
workflow_dispatch:
7+
8+
permissions:
9+
contents: write
10+
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.sha }}
13+
cancel-in-progress: true
814

915
jobs:
1016
releaser:
11-
uses: protocol/.github/.github/workflows/releaser.yml@master
17+
uses: pl-strflt/uci/.github/workflows/releaser.yml@v0.0

‎.github/workflows/tagpush.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1-
# File managed by web3-bot. DO NOT EDIT.
2-
# See https://github.com/protocol/.github/ for details.
3-
41
name: Tag Push Checker
2+
53
on:
64
push:
75
tags:
86
- v*
97

8+
permissions:
9+
contents: read
10+
issues: write
11+
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress: true
15+
1016
jobs:
1117
releaser:
12-
uses: protocol/.github/.github/workflows/tagpush.yml@master
18+
uses: pl-strflt/uci/.github/workflows/tagpush.yml@v0.0

‎.gx/lastpubver‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎go.mod‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
module github.com/ipfs/go-block-format
22

3-
go 1.18
4-
53
require (
6-
github.com/ipfs/go-cid v0.0.7
4+
github.com/ipfs/go-cid v0.4.1
75
github.com/ipfs/go-ipfs-util v0.0.2
8-
github.com/multiformats/go-multihash v0.0.14
6+
github.com/multiformats/go-multihash v0.2.3
97
)
108

119
require (
12-
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
13-
github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771 // indirect
14-
github.com/mr-tron/base58 v1.1.3 // indirect
10+
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
11+
github.com/minio/sha256-simd v1.0.0 // indirect
12+
github.com/mr-tron/base58 v1.2.0 // indirect
1513
github.com/multiformats/go-base32 v0.0.3 // indirect
1614
github.com/multiformats/go-base36 v0.1.0 // indirect
1715
github.com/multiformats/go-multibase v0.0.3 // indirect
18-
github.com/multiformats/go-varint v0.0.5 // indirect
16+
github.com/multiformats/go-varint v0.0.6 // indirect
1917
github.com/spaolacci/murmur3 v1.1.0 // indirect
20-
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 // indirect
18+
golang.org/x/crypto v0.1.0 // indirect
2119
golang.org/x/sys v0.1.0 // indirect
20+
lukechampine.com/blake3 v1.1.6 // indirect
2221
)
22+
23+
go 1.20

‎go.sum‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,41 @@
1-
github.com/ipfs/go-cid v0.0.7 h1:ysQJVJA3fNDF1qigJbsSQOdjhVLsOEoPdh0+R97k3jY=
2-
github.com/ipfs/go-cid v0.0.7/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
1+
github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=
2+
github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk=
33
github.com/ipfs/go-ipfs-util v0.0.2 h1:59Sswnk1MFaiq+VcaknX7aYEyGyGDAA73ilhEK2POp8=
44
github.com/ipfs/go-ipfs-util v0.0.2/go.mod h1:CbPtkWJzjLdEcezDns2XYaehFVNXG9zrdrtMecczcsQ=
5-
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g=
5+
github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
6+
github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4=
7+
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
68
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
7-
github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771 h1:MHkK1uRtFbVqvAgvWxafZe54+5uBxLluGylDiKgdhwo=
89
github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
10+
github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=
11+
github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM=
912
github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
10-
github.com/mr-tron/base58 v1.1.3 h1:v+sk57XuaCKGXpWtVBX8YJzO7hMGx4Aajh4TQbdEFdc=
1113
github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
14+
github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
15+
github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
1216
github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp8Nq/kkI=
1317
github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA=
1418
github.com/multiformats/go-base36 v0.1.0 h1:JR6TyF7JjGd3m6FbLU2cOxhC0Li8z8dLNGQ89tUg4F4=
1519
github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM=
1620
github.com/multiformats/go-multibase v0.0.3 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk=
1721
github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc=
1822
github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
19-
github.com/multiformats/go-multihash v0.0.14 h1:QoBceQYQQtNUuf6s7wHxnE2c8bhbMqhfGzNI032se/I=
20-
github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
21-
github.com/multiformats/go-varint v0.0.5 h1:XVZwSo04Cs3j/jS0uAEPpT3JY6DzMcVLLoWOSnCxOjg=
23+
github.com/multiformats/go-multihash v0.2.3 h1:7Lyc8XfX/IY2jWb/gI7JP+o7JEq9hOa7BFvVU9RSh+U=
24+
github.com/multiformats/go-multihash v0.2.3/go.mod h1:dXgKXCXjBzdscBLk9JkjINiEsCKRVch90MdaGiKsvSM=
2225
github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
26+
github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2W/KhfNY=
27+
github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
2328
github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
2429
github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
2530
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
26-
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 h1:1wopBVtVdWnn03fZelqdXTqk7U7zPQCb+T4rbU9ZEoU=
2731
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
32+
golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
33+
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
2834
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
2935
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
3036
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
3137
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
3238
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3339
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
40+
lukechampine.com/blake3 v1.1.6 h1:H3cROdztr7RCfoaTpGZFQsrqvweFLrqS73j7L7cmR5c=
41+
lukechampine.com/blake3 v1.1.6/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA=

0 commit comments

Comments
 (0)