From ae6fa05fd0f393cada3060234e43d70ce8297dd0 Mon Sep 17 00:00:00 2001
From: web3-bot <81333946+web3-bot@users.noreply.github.com>
Date: Wed, 18 Aug 2021 08:03:49 -0400
Subject: [PATCH] sync: update CI config files (#44)
---
.github/workflows/automerge.yml | 4 +++-
.github/workflows/go-check.yml | 34 ++++++++++++++++++++++++++++-----
.github/workflows/go-test.yml | 22 ++++++++++++++-------
go.mod | 2 +-
4 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 32bcc2e..44fad65 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -33,7 +33,9 @@ jobs:
automerge:
needs: automerge-check
runs-on: ubuntu-latest
- if: ${{ needs.automerge-check.outputs.status == 'true' }}
+ # The check for the user is redundant here, as this job depends on the automerge-check job,
+ # but it prevents this job from spinning up, just to be skipped shortly after.
+ if: github.event.pull_request.user.login == 'web3-bot' && needs.automerge-check.outputs.status == 'true'
steps:
- name: Wait on tests
uses: lewagon/wait-on-check-action@bafe56a6863672c681c3cf671f5e10b20abf2eaa # v0.2
diff --git a/.github/workflows/go-check.yml b/.github/workflows/go-check.yml
index 00ce947..6acdd48 100644
--- a/.github/workflows/go-check.yml
+++ b/.github/workflows/go-check.yml
@@ -8,17 +8,28 @@ 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.16.x"
+ 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@434f5f3816b358fe468fa83dcba62d794e7fe04b # 2021.1 (v0.2.0)
+ 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.0
+ uses: protocol/multiple-go-modules@v1.2
with:
run: |
go mod tidy
@@ -37,14 +48,27 @@ jobs:
fi
- name: go vet
if: ${{ success() || failure() }} # run this step even if the previous one failed
- uses: protocol/multiple-go-modules@v1.0
+ 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.0
+ 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
diff --git a/.github/workflows/go-test.yml b/.github/workflows/go-test.yml
index 4c7138b..7010dcc 100644
--- a/.github/workflows/go-test.yml
+++ b/.github/workflows/go-test.yml
@@ -10,7 +10,9 @@ jobs:
fail-fast: false
matrix:
os: [ "ubuntu", "windows", "macos" ]
- go: [ "1.15.x", "1.16.x" ]
+ go: [ "1.16.x", "1.17.x" ]
+ env:
+ COVERAGES: ""
runs-on: ${{ matrix.os }}-latest
name: ${{ matrix.os}} (go ${{ matrix.go }})
steps:
@@ -24,24 +26,30 @@ jobs:
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.0
+ uses: protocol/multiple-go-modules@v1.2
with:
- run: go test -v -coverprofile coverage.txt ./...
+ 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.0
+ 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.0
+ 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@a1ed4b322b4b38cb846afb5a0ebfa17086917d27 # v1.5.0
+ uses: codecov/codecov-action@51d810878be5422784e86451c0e7c14e5860ec47 # v2.0.2
with:
- file: coverage.txt
+ files: '${{ env.COVERAGES }}'
env_vars: OS=${{ matrix.os }}, GO=${{ matrix.go }}
diff --git a/go.mod b/go.mod
index 925ecd8..c7a935c 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/libp2p/go-eventbus
-go 1.15
+go 1.16
require (
github.com/libp2p/go-libp2p-core v0.5.7