diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ac63cf29..1d0584f0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -70,8 +70,11 @@ jobs: name: Windows arch: x64,arm64,ia32 - runner: macos-latest - name: macOS - arch: x64,arm64 #,universal + name: macOS-x64 + arch: x64 #,arm64,universal + - runner: macos-latest + name: macOS-arm64 + arch: arm64 name: '${{ matrix.name }} (${{ matrix.build }})' runs-on: ${{ matrix.runner }} @@ -84,7 +87,7 @@ jobs: cache: npm - name: Install dependencies (NPM${{ matrix.name == 'macOS' && '+PIP' || '' }}) - run: ${{ matrix.name == 'macOS' && 'python -m pip install setuptools &&' || '' }} npm ci + run: ${{ matrix.runner == 'macos-latest' && 'python -m pip install setuptools &&' || '' }} npm ci - name: Update dependencies if: ${{ matrix.build == 'latest' }} @@ -104,7 +107,7 @@ jobs: retry_on: error max_attempts: 3 timeout_minutes: 10 - command: ${{ matrix.name == 'macOS' && 'DEBUG="*" ' || '' }} npm run make -- -a ${{ matrix.arch }} + command: npm run make -- -a ${{ matrix.arch }} - name: Upload distributables as artifact uses: actions/upload-artifact@v3 diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 98af28ab..dfc1d246 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -20,9 +20,12 @@ jobs: - name: Windows runner: windows-latest arch: x64,arm64,ia32 - - name: macOS + - name: macOS-x64 runner: macos-latest - arch: x64,arm64 #,universal + arch: x64 #,arm64,universal + - name: macOS-arm64 + runner: macos-latest + arch: arm64 name: ${{ matrix.name }} (${{ matrix.arch }}) runs-on: ${{ matrix.runner }} @@ -34,7 +37,7 @@ jobs: cache: npm - name: Install dependencies (NPM${{ matrix.name == 'macOS' && '+PIP' || '' }}) - run: ${{ matrix.name == 'macOS' && 'python -m pip install setuptools &&' || '' }} npm ci + run: ${{ matrix.runner == 'macos-latest' && 'python -m pip install setuptools &&' || '' }} npm ci - name: TSC cache uses: actions/cache@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b3ec3574..87d3e35d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,9 +20,12 @@ jobs: - name: Windows runner: windows-latest arch: x64,arm64,ia32 - - name: macOS + - name: macOS-x64 runner: macos-latest - arch: x64,arm64 #,universal + arch: x64 #,arm64,universal + - name: macOS-arm64 + runner: macos-latest + arch: arm64 name: ${{ matrix.name }} (${{ matrix.arch }}) runs-on: ${{ matrix.runner }} @@ -34,7 +37,7 @@ jobs: cache: npm - name: Install dependencies (NPM${{ matrix.name == 'macOS' && '+PIP' || '' }}) - run: ${{ matrix.name == 'macOS' && 'python -m pip install setuptools &&' || '' }} npm ci + run: ${{ matrix.runner == 'macos-latest' && 'python -m pip install setuptools &&' || '' }} npm ci - name: TSC cache uses: actions/cache@v3