diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/bun-linux-build.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/bun-mac-aarch64.yml | 14 | ||||
| -rw-r--r-- | .github/workflows/bun-mac-x64-baseline.yml | 14 | ||||
| -rw-r--r-- | .github/workflows/bun-mac-x64.yml | 14 |
4 files changed, 28 insertions, 18 deletions
diff --git a/.github/workflows/bun-linux-build.yml b/.github/workflows/bun-linux-build.yml index 2efdf9780..941645c49 100644 --- a/.github/workflows/bun-linux-build.yml +++ b/.github/workflows/bun-linux-build.yml @@ -41,6 +41,7 @@ jobs: runner: linux-amd64 webkit_url: "https://github.com/oven-sh/WebKit/releases/download/dec17/bun-webkit-linux-amd64-lto.tar.gz" webkit_basename: "bun-webkit-linux-amd64-lto" + build_machine_arch: x86_64 - cpu: westmere tag: linux-x64-baseline arch: x86_64 @@ -48,6 +49,7 @@ jobs: runner: linux-amd64 webkit_url: "https://github.com/oven-sh/WebKit/releases/download/dec17/bun-webkit-linux-amd64-lto.tar.gz" webkit_basename: "bun-webkit-linux-amd64-lto" + build_machine_arch: x86_64 - cpu: native tag: linux-aarch64 arch: aarch64 @@ -55,6 +57,7 @@ jobs: runner: linux-arm64 webkit_url: "https://github.com/oven-sh/WebKit/releases/download/dec17/bun-webkit-linux-arm64-lto.tar.gz" webkit_basename: "bun-webkit-linux-arm64-lto" + build_machine_arch: aarch64 steps: - uses: actions/checkout@v3 @@ -85,6 +88,7 @@ jobs: build-args: | ARCH=${{matrix.arch}} BUILDARCH=${{matrix.build_arch}} + BUILD_MACHINE_ARCH=${{matrix.build_machine_arch}} CPU_TARGET=${{matrix.cpu}} WEBKIT_URL=${{matrix.webkit_url}} GIT_SHA=${{github.sha}} diff --git a/.github/workflows/bun-mac-aarch64.yml b/.github/workflows/bun-mac-aarch64.yml index 14b3cffca..00c15847c 100644 --- a/.github/workflows/bun-mac-aarch64.yml +++ b/.github/workflows/bun-mac-aarch64.yml @@ -68,6 +68,7 @@ jobs: build-args: | ARCH=${{ matrix.arch }} BUILDARCH=amd64 + BUILD_MACHINE_ARCH=x86_64 CPU_TARGET=${{ matrix.cpu }} TRIPLET=${{matrix.arch}}-macos-none GIT_SHA=${{github.sha}} @@ -85,6 +86,7 @@ jobs: build-args: | ARCH=${{ matrix.arch }} BUILDARCH=arm64 + BUILD_MACHINE_ARCH=aarch64 CPU_TARGET=${{ matrix.cpu }} TRIPLET=${{matrix.arch}}-macos-none GIT_SHA=${{github.sha}} @@ -163,11 +165,11 @@ jobs: OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps run: | - brew install ccache rust llvm@13 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force + brew install ccache rust llvm@15 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force echo "export PATH=$(brew --prefix ccache)/bin:\$PATH" >> $GITHUB_ENV echo "export PATH=$(brew --prefix coreutils)/libexec/gnubin:\$PATH" >> $GITHUB_ENV - echo "export PATH=$(brew --prefix llvm@13)/bin:\$PATH" >> $GITHUB_ENV - brew link --overwrite llvm@13 + echo "export PATH=$(brew --prefix llvm@15)/bin:\$PATH" >> $GITHUB_ENV + brew link --overwrite llvm@15 - name: ccache uses: hendrikmuhs/ccache-action@v1.2 with: @@ -280,10 +282,10 @@ jobs: OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps run: | - brew install rust ccache llvm@13 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force + brew install rust ccache llvm@15 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force echo "export PATH=$(brew --prefix coreutils)/libexec/gnubin:\$PATH" >> $GITHUB_ENV - echo "export PATH=$(brew --prefix llvm@13)/bin:\$PATH" >> $GITHUB_ENV - brew link --overwrite llvm@13 + echo "export PATH=$(brew --prefix llvm@15)/bin:\$PATH" >> $GITHUB_ENV + brew link --overwrite llvm@15 - name: ccache uses: hendrikmuhs/ccache-action@v1.2 with: diff --git a/.github/workflows/bun-mac-x64-baseline.yml b/.github/workflows/bun-mac-x64-baseline.yml index ad344831d..96958e2bb 100644 --- a/.github/workflows/bun-mac-x64-baseline.yml +++ b/.github/workflows/bun-mac-x64-baseline.yml @@ -68,6 +68,7 @@ jobs: build-args: | ARCH=${{ matrix.arch }} BUILDARCH=amd64 + BUILD_MACHINE_ARCH=x86_64 CPU_TARGET=${{ matrix.cpu }} TRIPLET=${{matrix.arch}}-macos-none GIT_SHA=${{github.sha}} @@ -85,6 +86,7 @@ jobs: build-args: | ARCH=${{ matrix.arch }} BUILDARCH=arm64 + BUILD_MACHINE_ARCH=aarch64 CPU_TARGET=${{ matrix.cpu }} TRIPLET=${{matrix.arch}}-macos-none GIT_SHA=${{github.sha}} @@ -163,11 +165,11 @@ jobs: OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps run: | - brew install ccache rust llvm@13 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force + brew install ccache rust llvm@15 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force echo "export PATH=$(brew --prefix ccache)/bin:\$PATH" >> $GITHUB_ENV echo "export PATH=$(brew --prefix coreutils)/libexec/gnubin:\$PATH" >> $GITHUB_ENV - echo "export PATH=$(brew --prefix llvm@13)/bin:\$PATH" >> $GITHUB_ENV - brew link --overwrite llvm@13 + echo "export PATH=$(brew --prefix llvm@15)/bin:\$PATH" >> $GITHUB_ENV + brew link --overwrite llvm@15 - name: ccache (dependencies) uses: hendrikmuhs/ccache-action@v1.2 if: matrix.dependencies @@ -281,10 +283,10 @@ jobs: OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps run: | - brew install ccache rust llvm@13 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force + brew install ccache rust llvm@15 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force echo "export PATH=$(brew --prefix coreutils)/libexec/gnubin:\$PATH" >> $GITHUB_ENV - echo "export PATH=$(brew --prefix llvm@13)/bin:\$PATH" >> $GITHUB_ENV - brew link --overwrite llvm@13 + echo "export PATH=$(brew --prefix llvm@15)/bin:\$PATH" >> $GITHUB_ENV + brew link --overwrite llvm@15 - name: ccache (link) uses: hendrikmuhs/ccache-action@v1.2 with: diff --git a/.github/workflows/bun-mac-x64.yml b/.github/workflows/bun-mac-x64.yml index 1b02c4efa..547ff4629 100644 --- a/.github/workflows/bun-mac-x64.yml +++ b/.github/workflows/bun-mac-x64.yml @@ -68,6 +68,7 @@ jobs: build-args: | ARCH=${{ matrix.arch }} BUILDARCH=amd64 + BUILD_MACHINE_ARCH=x86_64 CPU_TARGET=${{ matrix.cpu }} TRIPLET=${{matrix.arch}}-macos-none GIT_SHA=${{github.sha}} @@ -85,6 +86,7 @@ jobs: build-args: | ARCH=${{ matrix.arch }} BUILDARCH=arm64 + BUILD_MACHINE_ARCH=aarch64 CPU_TARGET=${{ matrix.cpu }} TRIPLET=${{matrix.arch}}-macos-none GIT_SHA=${{github.sha}} @@ -163,10 +165,10 @@ jobs: OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps run: | - brew install rust ccache llvm@13 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force + brew install rust ccache llvm@15 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force echo "export PATH=$(brew --prefix coreutils)/libexec/gnubin:\$PATH" >> $GITHUB_ENV - echo "export PATH=$(brew --prefix llvm@13)/bin:\$PATH" >> $GITHUB_ENV - brew link --overwrite llvm@13 + echo "export PATH=$(brew --prefix llvm@15)/bin:\$PATH" >> $GITHUB_ENV + brew link --overwrite llvm@15 - name: Download WebKit if: matrix.compile_obj env: @@ -283,10 +285,10 @@ jobs: OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps run: | - brew install rust ccache llvm@13 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force + brew install rust ccache llvm@15 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force echo "export PATH=$(brew --prefix coreutils)/libexec/gnubin:\$PATH" >> $GITHUB_ENV - echo "export PATH=$(brew --prefix llvm@13)/bin:\$PATH" >> $GITHUB_ENV - brew link --overwrite llvm@13 + echo "export PATH=$(brew --prefix llvm@15)/bin:\$PATH" >> $GITHUB_ENV + brew link --overwrite llvm@15 - name: Download WebKit env: CPU_TARGET: ${{ matrix.cpu }} |