Unverified Commit 9b9014a3 authored by Marten Seemann's avatar Marten Seemann Committed by GitHub

Merge pull request #8 from ipfs/web3-bot/sync

sync: update CI config files
parents f99ce924 88a30098
...@@ -5,11 +5,35 @@ ...@@ -5,11 +5,35 @@
# This reduces the friction associated with updating with our workflows. # This reduces the friction associated with updating with our workflows.
on: [ pull_request ] on: [ pull_request ]
name: Automerge
jobs: jobs:
automerge: automerge-check:
if: github.event.pull_request.user.login == 'web3-bot' if: github.event.pull_request.user.login == 'web3-bot'
runs-on: ubuntu-latest runs-on: ubuntu-latest
outputs:
status: ${{ steps.should-automerge.outputs.status }}
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Check if we should automerge
id: should-automerge
run: |
for commit in $(git rev-list --first-parent origin/${{ github.event.pull_request.base.ref }}..${{ github.event.pull_request.head.sha }}); do
committer=$(git show --format=$'%ce' -s $commit)
echo "Committer: $committer"
if [[ "$committer" != "web3-bot@users.noreply.github.com" ]]; then
echo "Commit $commit wasn't committed by web3-bot, but by $committer."
echo "::set-output name=status::false"
exit
fi
done
echo "::set-output name=status::true"
automerge:
needs: automerge-check
runs-on: ubuntu-latest
if: ${{ needs.automerge-check.outputs.status == 'true' }}
steps: steps:
- name: Wait on tests - name: Wait on tests
uses: lewagon/wait-on-check-action@bafe56a6863672c681c3cf671f5e10b20abf2eaa # v0.2 uses: lewagon/wait-on-check-action@bafe56a6863672c681c3cf671f5e10b20abf2eaa # v0.2
......
...@@ -2,26 +2,31 @@ ...@@ -2,26 +2,31 @@
# See https://github.com/protocol/.github/ for details. # See https://github.com/protocol/.github/ for details.
on: [push, pull_request] on: [push, pull_request]
name: Go Checks
jobs: jobs:
unit: unit:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Go checks name: All
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with:
submodules: recursive
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: "1.16.x" go-version: "1.16.x"
- name: Install staticcheck - name: Install staticcheck
run: go install honnef.co/go/tools/cmd/staticcheck@be534f007836a777104a15f2456cd1fffd3ddee8 # v2020.2.2 run: go install honnef.co/go/tools/cmd/staticcheck@434f5f3816b358fe468fa83dcba62d794e7fe04b # 2021.1 (v0.2.0)
- name: Check that go.mod is tidy - name: Check that go.mod is tidy
run: | uses: protocol/multiple-go-modules@v1.0
go mod tidy with:
if [[ -n $(git ls-files --other --exclude-standard --directory -- go.sum) ]]; then run: |
echo "go.sum was added by go mod tidy" go mod tidy
exit 1 if [[ -n $(git ls-files --other --exclude-standard --directory -- go.sum) ]]; then
fi echo "go.sum was added by go mod tidy"
git diff --exit-code -- go.sum go.mod exit 1
fi
git diff --exit-code -- go.sum go.mod
- name: gofmt - name: gofmt
if: ${{ success() || failure() }} # run this step even if the previous one failed if: ${{ success() || failure() }} # run this step even if the previous one failed
run: | run: |
...@@ -32,10 +37,14 @@ jobs: ...@@ -32,10 +37,14 @@ jobs:
fi fi
- name: go vet - name: go vet
if: ${{ success() || failure() }} # run this step even if the previous one failed if: ${{ success() || failure() }} # run this step even if the previous one failed
run: go vet ./... uses: protocol/multiple-go-modules@v1.0
with:
run: go vet ./...
- name: staticcheck - name: staticcheck
if: ${{ success() || failure() }} # run this step even if the previous one failed if: ${{ success() || failure() }} # run this step even if the previous one failed
run: | uses: protocol/multiple-go-modules@v1.0
set -o pipefail with:
staticcheck ./... | sed -e 's@\(.*\)\.go@./\1.go@g' run: |
set -o pipefail
staticcheck ./... | sed -e 's@\(.*\)\.go@./\1.go@g'
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# See https://github.com/protocol/.github/ for details. # See https://github.com/protocol/.github/ for details.
on: [push, pull_request] on: [push, pull_request]
name: Go Test
jobs: jobs:
unit: unit:
...@@ -11,9 +12,11 @@ jobs: ...@@ -11,9 +12,11 @@ jobs:
os: [ "ubuntu", "windows", "macos" ] os: [ "ubuntu", "windows", "macos" ]
go: [ "1.15.x", "1.16.x" ] go: [ "1.15.x", "1.16.x" ]
runs-on: ${{ matrix.os }}-latest runs-on: ${{ matrix.os }}-latest
name: Unit tests (${{ matrix.os}}, Go ${{ matrix.go }}) name: ${{ matrix.os}} (go ${{ matrix.go }})
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with:
submodules: recursive
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: ${{ matrix.go }} go-version: ${{ matrix.go }}
...@@ -22,17 +25,23 @@ jobs: ...@@ -22,17 +25,23 @@ jobs:
go version go version
go env go env
- name: Run tests - name: Run tests
run: go test -v -coverprofile coverage.txt ./... uses: protocol/multiple-go-modules@v1.0
with:
run: go test -v -coverprofile coverage.txt ./...
- name: Run tests (32 bit) - name: Run tests (32 bit)
if: ${{ matrix.os != 'macos' }} # can't run 32 bit tests on OSX. if: ${{ matrix.os != 'macos' }} # can't run 32 bit tests on OSX.
uses: protocol/multiple-go-modules@v1.0
env: env:
GOARCH: 386 GOARCH: 386
run: go test -v ./... with:
run: go test -v ./...
- name: Run tests with race detector - name: Run tests with race detector
if: ${{ matrix.os == 'ubuntu' }} # speed things up. Windows and OSX VMs are slow if: ${{ matrix.os == 'ubuntu' }} # speed things up. Windows and OSX VMs are slow
run: go test -v -race ./... uses: protocol/multiple-go-modules@v1.0
with:
run: go test -v -race ./...
- name: Upload coverage to Codecov - name: Upload coverage to Codecov
uses: codecov/codecov-action@967e2b38a85a62bd61be5529ada27ebc109948c2 # v1.4.1 uses: codecov/codecov-action@a1ed4b322b4b38cb846afb5a0ebfa17086917d27 # v1.5.0
with: with:
file: coverage.txt file: coverage.txt
env_vars: OS=${{ matrix.os }}, GO=${{ matrix.go }} env_vars: OS=${{ matrix.os }}, GO=${{ matrix.go }}
...@@ -61,7 +61,7 @@ func (w *wrapper) Peek() Elem { ...@@ -61,7 +61,7 @@ func (w *wrapper) Peek() Elem {
if len(w.heapinterface.elems) == 0 { if len(w.heapinterface.elems) == 0 {
return nil return nil
} }
return w.heapinterface.elems[0].(Elem) return w.heapinterface.elems[0]
} }
func (w *wrapper) Remove(index int) Elem { func (w *wrapper) Remove(index int) Elem {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment