From 06dad35afd0ae9f939245518a5b8643f0c96f576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= Date: Tue, 30 Apr 2024 16:09:09 +0300 Subject: [PATCH] Macos-latest is now ARM64. --- .github/workflows/build-test-macos-arm64.yml | 25 -------------------- .github/workflows/build-test.yml | 14 ++++++++--- 2 files changed, 11 insertions(+), 28 deletions(-) delete mode 100644 .github/workflows/build-test-macos-arm64.yml diff --git a/.github/workflows/build-test-macos-arm64.yml b/.github/workflows/build-test-macos-arm64.yml deleted file mode 100644 index d79262da7..000000000 --- a/.github/workflows/build-test-macos-arm64.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Build and run tests (MacOS ARM64) - -on: - push: - branches: [master, rc/*, feat/*] - pull_request: - branches: [master, feat/*, rc/*] - workflow_dispatch: - -jobs: - test: - strategy: - matrix: - go-version: [1.20.7] - runs-on: macos-13-xlarge - steps: - - name: Install Go - uses: actions/setup-go@v5 - with: - go-version: ${{ matrix.go-version }} - - name: Checkout code - uses: actions/checkout@v4 - - name: Test - run: | - make test-w2 diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 3fa80144a..a48c83897 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -21,6 +21,14 @@ jobs: go-version: ${{ matrix.go-version }} - name: Checkout code uses: actions/checkout@v2 - - name: Test - run: | - make test + + - name: Test (Linux) + if: runner.os == 'Linux' + run: | + make test + + - name: Test (MacOS ARM64) + if: runner.os == 'macOS' + run: | + make test-w2 +