diff options
| author |  Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
| 2022-12-06 22:17:39 -0800 |
|---|---|---|
| committer | Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
| 2022-12-06 22:17:55 -0800 |
| commit | 511c0ab38695590f49c5dd6b45cf3c3991602489 (patch) | |
| tree | 88cb279e988b47da8db4171b557d762091f928c5 | |
| parent | d9306c2681c11c0b9d9fabe1ba246041244554cd (diff) | |
| download | bun-511c0ab38695590f49c5dd6b45cf3c3991602489.tar.gz bun-511c0ab38695590f49c5dd6b45cf3c3991602489.tar.zst bun-511c0ab38695590f49c5dd6b45cf3c3991602489.zip | |
Fix aarch64
Diffstat (limited to '')
| -rw-r--r-- | .github/workflows/bun-mac-aarch64.yml | 23 | ||||
| -rw-r--r-- | .github/workflows/bun-mac-x64-baseline.yml | 21 | ||||
| -rw-r--r-- | .github/workflows/bun-mac-x64.yml | 18 |
3 files changed, 57 insertions, 5 deletions
diff --git a/.github/workflows/bun-mac-aarch64.yml b/.github/workflows/bun-mac-aarch64.yml index f6b52e6ed..2fda41579 100644 --- a/.github/workflows/bun-mac-aarch64.yml +++ b/.github/workflows/bun-mac-aarch64.yml @@ -59,12 +59,12 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push uses: docker/build-push-action@v3 + if: env.RUNNER_ARCH == 'X64' with: context: . push: false - tags: ghcr.io/oven-sh/bun-obj:${{github.sha}}-${{matrix.cpu}}-${{matrix.arch}}-macos - cache-from: type=local,src=/tmp/.buildx-cache-${{matrix.cpu}}-${matrix.arch}-macos-bun-obj - cache-to: type=local,dest=/tmp/.buildx-cache-${{matrix.cpu}}-${matrix.arch}-macos-bun-obj + cache-from: type=gha + cache-to: type=gha,mode=min build-args: | ARCH=${{ matrix.arch }} BUILDARCH=amd64 @@ -74,6 +74,23 @@ jobs: platforms: linux/amd64 target: build_release_obj outputs: type=local,dest=${{runner.temp}}/release + - name: Build and push + uses: docker/build-push-action@v3 + if: env.RUNNER_ARCH == 'ARM64' + with: + context: . + push: false + cache-from: type=gha + cache-to: type=gha,mode=min + build-args: | + ARCH=${{ matrix.arch }} + BUILDARCH=aarch64 + CPU_TARGET=${{ matrix.cpu }} + TRIPLET=${{matrix.arch}}-macos-none + GIT_SHA=${{github.sha}} + platforms: linux/amd64 + target: build_release_obj + outputs: type=local,dest=${{runner.temp}}/release - uses: actions/upload-artifact@v3 with: name: ${{ matrix.tag }} diff --git a/.github/workflows/bun-mac-x64-baseline.yml b/.github/workflows/bun-mac-x64-baseline.yml index 4eb4067f9..d57781133 100644 --- a/.github/workflows/bun-mac-x64-baseline.yml +++ b/.github/workflows/bun-mac-x64-baseline.yml @@ -59,12 +59,12 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push uses: docker/build-push-action@v3 + if: env.RUNNER_ARCH == 'X64' with: context: . push: false - tags: ghcr.io/oven-sh/bun-obj:${{github.sha}}-${{matrix.cpu}}-${{matrix.arch}}-macos-baseline cache-from: type=gha - cache-to: type=gha,mode=max + cache-to: type=gha,mode=min build-args: | ARCH=${{ matrix.arch }} BUILDARCH=amd64 @@ -74,6 +74,23 @@ jobs: platforms: linux/amd64 target: build_release_obj outputs: type=local,dest=${{runner.temp}}/release + - name: Build and push + uses: docker/build-push-action@v3 + if: env.RUNNER_ARCH == 'ARM64' + with: + context: . + push: false + cache-from: type=gha + cache-to: type=gha,mode=min + build-args: | + ARCH=${{ matrix.arch }} + BUILDARCH=aarch64 + CPU_TARGET=${{ matrix.cpu }} + TRIPLET=${{matrix.arch}}-macos-none + GIT_SHA=${{github.sha}} + platforms: linux/arm64 + target: build_release_obj + outputs: type=local,dest=${{runner.temp}}/release - uses: actions/upload-artifact@v3 with: name: ${{ matrix.tag }} diff --git a/.github/workflows/bun-mac-x64.yml b/.github/workflows/bun-mac-x64.yml index 83c8393de..75c04d2c7 100644 --- a/.github/workflows/bun-mac-x64.yml +++ b/.github/workflows/bun-mac-x64.yml @@ -59,6 +59,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push uses: docker/build-push-action@v3 + if: env.RUNNER_ARCH == 'X64' with: context: . push: false @@ -73,6 +74,23 @@ jobs: platforms: linux/amd64 target: build_release_obj outputs: type=local,dest=${{runner.temp}}/release + - name: Build and push + uses: docker/build-push-action@v3 + if: env.RUNNER_ARCH == 'ARM64' + with: + context: . + push: false + cache-from: type=gha + cache-to: type=gha,mode=min + build-args: | + ARCH=${{ matrix.arch }} + BUILDARCH=aarch64 + CPU_TARGET=${{ matrix.cpu }} + TRIPLET=${{matrix.arch}}-macos-none + GIT_SHA=${{github.sha}} + platforms: linux/arm64 + target: build_release_obj + outputs: type=local,dest=${{runner.temp}}/release - uses: actions/upload-artifact@v3 with: name: ${{ matrix.tag }} |