From 2a43fa4421e65bfa8b50fba40345717980f1c3fd Mon Sep 17 00:00:00 2001
From: David Anderson <danderson@tailscale.com>
Date: Sat, 11 Feb 2023 16:33:21 -0800
Subject: [PATCH] .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>
---
 .github/workflows/test.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 564801694..f43fda7a1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,7 +29,7 @@ jobs:
         include:
           - goarch: amd64
           - goarch: amd64
-            race: true
+            variant: race
           - goarch: "386" # thanks yaml
     runs-on: ubuntu-latest
     steps:
@@ -48,19 +48,19 @@ jobs:
       env:
         GOARCH: ${{ matrix.goarch }}
     - name: get qemu # for tstest/archtest
-      if: matrix.goarch == 'amd64' && !matrix.race
+      if: matrix.goarch == 'amd64' && matrix.variant == ''
       run: |
         sudo apt-get -y update
         sudo apt-get -y install qemu-user
     - name: build test wrapper
       run: ./tool/go build -o /tmp/testwrapper ./cmd/testwrapper
     - 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 ./...
       env:
         GOARCH: ${{ matrix.goarch }}
     - name: test all (race)
-      if: matrix.race
+      if: matrix.variant == 'race'
       run: ./tool/go test -race -exec=/tmp/testwrapper -bench=. -benchtime=1x ./...
       env:
         GOARCH: ${{ matrix.goarch }}