Merge 2814ddf into 04a8119

grafana · Jan 11, 2024 · 1a6d5cc · 1a6d5cc
2 parents 04a8119 + 2814ddf
commit 1a6d5cc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         go-version: [1.20.x]
-        platform: [ubuntu-latest, windows-2019]
+        platform: [ubuntu-latest, windows-2019, macos-latest]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Checkout code
@@ -37,8 +37,8 @@ jobs:
           go version
           export GOMAXPROCS=2
           args=("-p" "2" "-race")
-          # Run with less concurrency on Windows to minimize flakiness.
-          if [[ "${{ matrix.platform }}" == windows* ]]; then
+          # Run with less concurrency on Windows/MacOS to minimize flakiness.
+          if [[ "${{ matrix.platform }}" == windows* || "${{ matrix.platform }}" == macos* ]]; then
             unset args[2]
             args[1]="1"
             export GOMAXPROCS=1
@@ -49,7 +49,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest, windows-2019]
+        platform: [ubuntu-latest, windows-2019, macos-latest]
     runs-on: ${{ matrix.platform }}
     continue-on-error: true
     steps:
@@ -75,8 +75,8 @@ jobs:
           go version
           export GOMAXPROCS=2
           args=("-p" "2" "-race")
-          # Run with less concurrency on Windows to minimize flakiness.
-          if [[ "${{ matrix.platform }}" == windows* ]]; then
+          # Run with less concurrency on Windows/MacOS to minimize flakiness.
+          if [[ "${{ matrix.platform }}" == windows* || "${{ matrix.platform }}" == macos* ]]; then
             unset args[2]
             args[1]="1"
             export GOMAXPROCS=1
@@ -88,7 +88,7 @@ jobs:
       fail-fast: false
       matrix:
         go-version: [1.21.x]
-        platform: [ubuntu-latest, windows-2019]
+        platform: [ubuntu-latest, windows-2019, macos-latest]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Checkout code
@@ -103,8 +103,8 @@ jobs:
           go version
           export GOMAXPROCS=2
           args=("-p" "2" "-race")
-          # Run with less concurrency on Windows to minimize flakiness.
-          if [[ "${{ matrix.platform }}" == windows* ]]; then
+          # Run with less concurrency on Windows/MacOS to minimize flakiness.
+          if [[ "${{ matrix.platform }}" == windows* || "${{ matrix.platform }}" == macos* ]]; then
             unset args[2]
             args[1]="1"
             export GOMAXPROCS=1
@@ -126,6 +126,10 @@ jobs:
           CODECOV_BASH_SHA512SUM: d075b412a362a9a2b7aedfec3b8b9a9a927b3b99e98c7c15a2b76ef09862aeb005e91d76a5fd71b511141496d0fd23d1b42095f722ebcd509d768fba030f159e
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: |
+          if [[ "${{ matrix.platform }}" == macos* ]]; then
+            shopt -s expand_aliases
+            alias sha512sum='shasum -a 512'
+          fi
           curl -fsSLO "https://raw.githubusercontent.com/codecov/codecov-bash/${CODECOV_BASH_VERSION}/codecov"
           echo "$CODECOV_BASH_SHA512SUM codecov" | sha512sum -c -
           platform="${{ matrix.platform }}"

diff --git a/js/runner_test.go b/js/runner_test.go
@@ -766,7 +766,7 @@ func TestVURunInterruptDoesntPanic(t *testing.T) {
 					assert.Contains(t, vuErr.Error(), "context canceled")
 				}()
 				<-ch
-				time.Sleep(time.Millisecond * 1) // NOTE: increase this in case of problems ;)
+				time.Sleep(time.Microsecond * 1) // NOTE: increase this in case of problems ;)
 				newCancel()
 				wg.Wait()
 			}