From 14171d68b99299f99dc2e3b5721cf5e9ee50bf96 Mon Sep 17 00:00:00 2001 From: Jesse S Date: Tue, 30 Jul 2024 10:17:43 -0700 Subject: [PATCH] build: TOOLS-2934 use github actions to build m-series macos (#43) * build: add m1 build * build: bump macos-11 runners to macos-12 --------- Co-authored-by: dwelch-spike <53876192+dwelch-spike@users.noreply.github.com> --- .github/workflows/mac-artifact.yml | 11 +++++++---- .github/workflows/snyk-test.yml | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/mac-artifact.yml b/.github/workflows/mac-artifact.yml index a3151d0..1e33fa7 100644 --- a/.github/workflows/mac-artifact.yml +++ b/.github/workflows/mac-artifact.yml @@ -2,7 +2,7 @@ name: Mac Artifact on: push: - branches: [main] + branches: [main, actionsHub] pull_request: branches: [main] workflow_call: @@ -14,7 +14,10 @@ on: jobs: build: - runs-on: macos-11 + strategy: + matrix: + os: [macos-12, macos-14] + runs-on: ${{ matrix.os }} steps: - name: Get checkout directory uses: haya14busa/action-cond@v1 @@ -60,7 +63,7 @@ jobs: check-latest: true cache: true cache-dependency-path: ${{ steps.working-dir.outputs.value }}/go.sum - - uses: kenchan0130/actions-system-info@master + - uses: kenchan0130/actions-system-info@v1.3.0 id: system-info - name: Cache asconfig uses: actions/cache@v3 @@ -82,7 +85,7 @@ jobs: run: | sudo make install asconfig --version 2>&1 | grep "Aerospike Config" - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: ${{ steps.system-info.outputs.platform }}-${{ runner.arch }}-${{ runner.os }}-${{ steps.system-info.outputs.release }}-asconfig path: ${{ steps.working-dir.outputs.value }}/bin/asconfig diff --git a/.github/workflows/snyk-test.yml b/.github/workflows/snyk-test.yml index 9777335..f2c598a 100644 --- a/.github/workflows/snyk-test.yml +++ b/.github/workflows/snyk-test.yml @@ -25,7 +25,7 @@ jobs: env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - name: Upload snyk results - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: asconfig-snyk.txt path: asconfig-snyk.txt \ No newline at end of file