From 2850361d874caa39f95010fcc6cf7d182f314f23 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Tue, 1 Apr 2025 14:52:51 -0400 Subject: [PATCH] CI: Set correct architecture for JS artifact builds --- .github/workflows/js-artifacts.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/js-artifacts.yml b/.github/workflows/js-artifacts.yml index 821c2190f23..251663cff05 100644 --- a/.github/workflows/js-artifacts.yml +++ b/.github/workflows/js-artifacts.yml @@ -17,13 +17,16 @@ jobs: strategy: fail-fast: false matrix: + os_name: ['Linux'] os: [ubuntu-24.04] + arch: ['x86_64'] package_type: [Linux-x86_64] - os_name: [Linux] + include: - - os: macos-14 + - os_name: 'macOS' + os: macos-15 + arch: 'arm64' package_type: macOS-universal2 - os_name: macOS concurrency: group: ${{ github.workflow }}-${{ matrix.os_name }} @@ -36,14 +39,14 @@ jobs: uses: ./.github/actions/setup with: os: ${{ matrix.os_name }} - arch: 'Lagom' + arch: ${{ matrix.arch }} - name: Restore Caches uses: ./.github/actions/cache-restore id: 'cache-restore' with: os: ${{ matrix.os_name }} - arch: 'Lagom' + arch: ${{ matrix.arch }} cache_key_extra: 'LibJS Artifacts' ccache_path: ${{ env.CCACHE_DIR }} download_cache_path: ${{ github.workspace }}/Build/caches