lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.github/workflows: use variant=race instead of race=true for race test 

Github's matrix runner formats the race variant as '(amd64, true)' if we
use race=true. So, change the way the variable is defined so that it says
'(amd64, race)' even if that makes the if statements a bit more complex.

Signed-off-by: David Anderson <danderson@tailscale.com>
pull/7265/head
David Anderson 2023-02-11 16:33:21 -08:00 committed by Dave Anderson
parent 9fc3d00c17
commit 2a43fa4421
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/test.yml vendored
View File

@ -29,7 +29,7 @@ jobs:
include: include:
- goarch: amd64 - goarch: amd64
- goarch: amd64 - goarch: amd64
race: true variant: race
- goarch: "386" # thanks yaml - goarch: "386" # thanks yaml
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
@ -48,19 +48,19 @@ jobs:
env: env:
GOARCH: ${{ matrix.goarch }} GOARCH: ${{ matrix.goarch }}
- name: get qemu # for tstest/archtest - name: get qemu # for tstest/archtest
if: matrix.goarch == 'amd64' && !matrix.race if: matrix.goarch == 'amd64' && matrix.variant == ''
run: | run: |
sudo apt-get -y update sudo apt-get -y update
sudo apt-get -y install qemu-user sudo apt-get -y install qemu-user
- name: build test wrapper - name: build test wrapper
run: ./tool/go build -o /tmp/testwrapper ./cmd/testwrapper run: ./tool/go build -o /tmp/testwrapper ./cmd/testwrapper
- name: test all - name: test all
if: "!matrix.race" # thanks yaml, unquoted !foo has a magical meaning if: matrix.variant != 'race'
run: ./tool/go test -exec=/tmp/testwrapper -bench=. -benchtime=1x ./... run: ./tool/go test -exec=/tmp/testwrapper -bench=. -benchtime=1x ./...
env: env:
GOARCH: ${{ matrix.goarch }} GOARCH: ${{ matrix.goarch }}
- name: test all (race) - name: test all (race)
if: matrix.race if: matrix.variant == 'race'
run: ./tool/go test -race -exec=/tmp/testwrapper -bench=. -benchtime=1x ./... run: ./tool/go test -race -exec=/tmp/testwrapper -bench=. -benchtime=1x ./...
env: env:
GOARCH: ${{ matrix.goarch }} GOARCH: ${{ matrix.goarch }}