From f758f6358d6a4ed16fa9968fad382827c4eceb1d Mon Sep 17 00:00:00 2001 From: web3-bot Date: Sun, 13 Aug 2023 20:01:20 +0000 Subject: [PATCH 1/9] chore: add or force update .github/workflows/go-test.yml --- .github/workflows/go-test.yml | 67 ++++++++--------------------------- 1 file changed, 15 insertions(+), 52 deletions(-) diff --git a/.github/workflows/go-test.yml b/.github/workflows/go-test.yml index 7010dcce..d4ca588c 100644 --- a/.github/workflows/go-test.yml +++ b/.github/workflows/go-test.yml @@ -1,55 +1,18 @@ -# File managed by web3-bot. DO NOT EDIT. -# See https://github.com/protocol/.github/ for details. - -on: [push, pull_request] name: Go Test +on: + pull_request: + push: + branches: ["master"] + workflow_dispatch: + +permissions: + contents: read + +concurrency: + group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event_name == 'push' && github.sha || github.ref }} + cancel-in-progress: true + jobs: - unit: - strategy: - fail-fast: false - matrix: - os: [ "ubuntu", "windows", "macos" ] - go: [ "1.16.x", "1.17.x" ] - env: - COVERAGES: "" - runs-on: ${{ matrix.os }}-latest - name: ${{ matrix.os}} (go ${{ matrix.go }}) - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - uses: actions/setup-go@v2 - with: - go-version: ${{ matrix.go }} - - name: Go information - run: | - go version - go env - - name: Run repo-specific setup - uses: ./.github/actions/go-test-setup - if: hashFiles('./.github/actions/go-test-setup') != '' - - name: Run tests - uses: protocol/multiple-go-modules@v1.2 - with: - run: go test -v -coverprofile module-coverage.txt ./... - - name: Run tests (32 bit) - if: ${{ matrix.os != 'macos' }} # can't run 32 bit tests on OSX. - uses: protocol/multiple-go-modules@v1.2 - env: - GOARCH: 386 - with: - run: go test -v ./... - - name: Run tests with race detector - if: ${{ matrix.os == 'ubuntu' }} # speed things up. Windows and OSX VMs are slow - uses: protocol/multiple-go-modules@v1.2 - with: - run: go test -v -race ./... - - name: Collect coverage files - shell: bash - run: echo "COVERAGES=$(find . -type f -name 'module-coverage.txt' | tr -s '\n' ',' | sed 's/,$//')" >> $GITHUB_ENV - - name: Upload coverage to Codecov - uses: codecov/codecov-action@51d810878be5422784e86451c0e7c14e5860ec47 # v2.0.2 - with: - files: '${{ env.COVERAGES }}' - env_vars: OS=${{ matrix.os }}, GO=${{ matrix.go }} + go-test: + uses: pl-strflt/uci/.github/workflows/go-test.yml@v0.0 From 279482228e5a8e1906996781a552a9957815e5e8 Mon Sep 17 00:00:00 2001 From: web3-bot Date: Sun, 13 Aug 2023 20:01:20 +0000 Subject: [PATCH 2/9] chore: add or force update .github/workflows/go-check.yml --- .github/workflows/go-check.yml | 86 ++++++---------------------------- 1 file changed, 15 insertions(+), 71 deletions(-) diff --git a/.github/workflows/go-check.yml b/.github/workflows/go-check.yml index 6acdd48f..9ce6260d 100644 --- a/.github/workflows/go-check.yml +++ b/.github/workflows/go-check.yml @@ -1,74 +1,18 @@ -# File managed by web3-bot. DO NOT EDIT. -# See https://github.com/protocol/.github/ for details. - -on: [push, pull_request] name: Go Checks -jobs: - unit: - runs-on: ubuntu-latest - name: All - env: - RUNGOGENERATE: false - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - uses: actions/setup-go@v2 - with: - go-version: "1.17.x" - - name: Run repo-specific setup - uses: ./.github/actions/go-check-setup - if: hashFiles('./.github/actions/go-check-setup') != '' - - name: Read config - if: hashFiles('./.github/workflows/go-check-config.json') != '' - run: | - if jq -re .gogenerate ./.github/workflows/go-check-config.json; then - echo "RUNGOGENERATE=true" >> $GITHUB_ENV - fi - - name: Install staticcheck - run: go install honnef.co/go/tools/cmd/staticcheck@df71e5d0e0ed317ebf43e6e59cf919430fa4b8f2 # 2021.1.1 (v0.2.1) - - name: Check that go.mod is tidy - uses: protocol/multiple-go-modules@v1.2 - with: - run: | - go mod tidy - if [[ -n $(git ls-files --other --exclude-standard --directory -- go.sum) ]]; then - echo "go.sum was added by go mod tidy" - exit 1 - fi - git diff --exit-code -- go.sum go.mod - - name: gofmt - if: ${{ success() || failure() }} # run this step even if the previous one failed - run: | - out=$(gofmt -s -l .) - if [[ -n "$out" ]]; then - echo $out | awk '{print "::error file=" $0 ",line=0,col=0::File is not gofmt-ed."}' - exit 1 - fi - - name: go vet - if: ${{ success() || failure() }} # run this step even if the previous one failed - uses: protocol/multiple-go-modules@v1.2 - with: - run: go vet ./... - - name: staticcheck - if: ${{ success() || failure() }} # run this step even if the previous one failed - uses: protocol/multiple-go-modules@v1.2 - with: - run: | - set -o pipefail - staticcheck ./... | sed -e 's@\(.*\)\.go@./\1.go@g' - - name: go generate - uses: protocol/multiple-go-modules@v1.2 - if: (success() || failure()) && env.RUNGOGENERATE == 'true' - with: - run: | - git clean -fd # make sure there aren't untracked files / directories - go generate ./... - # check if go generate modified or added any files - if ! $(git add . && git diff-index HEAD --exit-code --quiet); then - echo "go generated caused changes to the repository:" - git status --short - exit 1 - fi +on: + pull_request: + push: + branches: ["master"] + workflow_dispatch: + +permissions: + contents: read +concurrency: + group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event_name == 'push' && github.sha || github.ref }} + cancel-in-progress: true + +jobs: + go-check: + uses: pl-strflt/uci/.github/workflows/go-check.yml@v0.0 From a30c516ddbbe29c30c1bd2b01b303ed81f0903c1 Mon Sep 17 00:00:00 2001 From: web3-bot Date: Sun, 13 Aug 2023 20:01:20 +0000 Subject: [PATCH 3/9] chore: add or force update .github/workflows/releaser.yml --- .github/workflows/releaser.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/releaser.yml diff --git a/.github/workflows/releaser.yml b/.github/workflows/releaser.yml new file mode 100644 index 00000000..dd8081b9 --- /dev/null +++ b/.github/workflows/releaser.yml @@ -0,0 +1,17 @@ +name: Releaser + +on: + push: + paths: [ 'version.json' ] + workflow_dispatch: + +permissions: + contents: write + +concurrency: + group: ${{ github.workflow }}-${{ github.sha }} + cancel-in-progress: true + +jobs: + releaser: + uses: pl-strflt/uci/.github/workflows/releaser.yml@v0.0 From f482671eaa2eaa90101a41f46ae8b257f1390ae8 Mon Sep 17 00:00:00 2001 From: web3-bot Date: Sun, 13 Aug 2023 20:01:21 +0000 Subject: [PATCH 4/9] chore: add or force update .github/workflows/release-check.yml --- .github/workflows/release-check.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/release-check.yml diff --git a/.github/workflows/release-check.yml b/.github/workflows/release-check.yml new file mode 100644 index 00000000..bda61600 --- /dev/null +++ b/.github/workflows/release-check.yml @@ -0,0 +1,19 @@ +name: Release Checker + +on: + pull_request_target: + paths: [ 'version.json' ] + types: [ opened, synchronize, reopened, labeled, unlabeled ] + workflow_dispatch: + +permissions: + contents: write + pull-requests: write + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + release-check: + uses: pl-strflt/uci/.github/workflows/release-check.yml@v0.0 From 89cbf0ce89baf06587745fa2f86b97dea90b37e0 Mon Sep 17 00:00:00 2001 From: web3-bot Date: Sun, 13 Aug 2023 20:01:21 +0000 Subject: [PATCH 5/9] chore: add or force update .github/workflows/tagpush.yml --- .github/workflows/tagpush.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/tagpush.yml diff --git a/.github/workflows/tagpush.yml b/.github/workflows/tagpush.yml new file mode 100644 index 00000000..59de8cb9 --- /dev/null +++ b/.github/workflows/tagpush.yml @@ -0,0 +1,18 @@ +name: Tag Push Checker + +on: + push: + tags: + - v* + +permissions: + contents: read + issues: write + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + releaser: + uses: pl-strflt/uci/.github/workflows/tagpush.yml@v0.0 From e72d8eb1ecf963a3ceb15bc5e8145c3f0dab0883 Mon Sep 17 00:00:00 2001 From: web3-bot Date: Sun, 13 Aug 2023 20:01:21 +0000 Subject: [PATCH 6/9] chore: add or force update version.json --- version.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 version.json diff --git a/version.json b/version.json new file mode 100644 index 00000000..26f9a280 --- /dev/null +++ b/version.json @@ -0,0 +1,3 @@ +{ + "version": "v2.2.0" +} From 507836dd8ee94e005ca556904bae03b15e2c1f6e Mon Sep 17 00:00:00 2001 From: web3-bot Date: Mon, 14 Aug 2023 08:29:12 +0000 Subject: [PATCH 7/9] chore: bump go.mod to Go 1.19 and run go fix --- go.mod | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 953c81d5..1b48a25c 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,10 @@ module github.com/libp2p/zeroconf/v2 -go 1.16 +go 1.19 require ( github.com/miekg/dns v1.1.43 golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6 - golang.org/x/sys v0.0.0-20210426080607-c94f62235c83 // indirect ) + +require golang.org/x/sys v0.0.0-20210426080607-c94f62235c83 // indirect From 60fc111766bf286d1cd7d6828a33975831073b73 Mon Sep 17 00:00:00 2001 From: web3-bot Date: Mon, 14 Aug 2023 08:29:12 +0000 Subject: [PATCH 8/9] fix: stop using the deprecated io/ioutil package --- server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.go b/server.go index 2dbf536e..d895acd1 100644 --- a/server.go +++ b/server.go @@ -549,7 +549,7 @@ func (s *Server) serviceTypeName(resp *dns.Msg, ttl uint32) { } // Perform probing & announcement -//TODO: implement a proper probing & conflict resolution +// TODO: implement a proper probing & conflict resolution func (s *Server) probe() { defer s.refCount.Done() From d599255a8c795452c7cbbdb9560d9746548499ba Mon Sep 17 00:00:00 2001 From: web3-bot Date: Mon, 14 Aug 2023 09:30:15 +0000 Subject: [PATCH 9/9] chore: bump go.mod to Go 1.20 and run go fix --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 1b48a25c..5911a9c3 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/libp2p/zeroconf/v2 -go 1.19 +go 1.20 require ( github.com/miekg/dns v1.1.43