merge, rm qemu

viamrobotics · Aug 17, 2023 · 38dcec5 · 38dcec5
1 parent 8697e1b
commit 38dcec5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/.github/workflows/server-32bit.yml b/.github/workflows/server-32bit.yml
@@ -31,8 +31,6 @@ jobs:
       packages: read
     steps:
     - uses: actions/checkout@v3
-    - uses: docker/setup-qemu-action@v2
-    - uses: docker/setup-buildx-action@v2
     - uses: docker/login-action@v2
       with:
         registry: ghcr.io

diff --git a/Makefile b/Makefile
@@ -75,7 +75,7 @@ test-go: tool-install
 	PATH=$(PATH_WITH_TOOLS) ./etc/test.sh race
 
 test-go-no-race: tool-install
-	# DONOTMERGE MORE_GO_FLAGS
+	# DONOTMERGE MORE_GO_TAGS
 	PATH=$(PATH_WITH_TOOLS) MORE_GO_TAGS=,no_tflite,no_pigpio ./etc/test.sh
 
 test-web:

diff --git a/etc/test.sh b/etc/test.sh
@@ -17,7 +17,7 @@ if [[ "$1" == "race" ]]; then
 fi
 
 # We run analyzetests on every run, pass or fail. We only run analyzecoverage when all tests passed.
-PION_LOG_WARN=webrtc,datachannel,sctp gotestsum --format standard-verbose --jsonfile json.log -- -tags=no_skip$MORE_GO_FLAGS $RACE $COVER ./...
+PION_LOG_WARN=webrtc,datachannel,sctp gotestsum --format standard-verbose --jsonfile json.log -- -tags=no_skip$MORE_GO_TAGS $RACE $COVER ./...
 SUCCESS=$?
 
 cat json.log | go run ./etc/analyzetests/main.go