Skip to content

Commit

Permalink
Merge branch 'main' into nektro-patch-47166
Browse files Browse the repository at this point in the history
  • Loading branch information
nektro authored Apr 22, 2024
2 parents d1356c3 + c3c1750 commit 412c89f
Show file tree
Hide file tree
Showing 133 changed files with 2,485 additions and 4,642 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/build-darwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ on:
type: boolean

env:
LLVM_VERSION: 16
LLVM_VERSION: 17
BUN_VERSION: 1.1.2

jobs:
Expand Down Expand Up @@ -78,6 +78,7 @@ jobs:
automake \
[email protected] \
ninja \
golang \
gnu-sed --force
echo "$(brew --prefix ccache)/bin" >> $GITHUB_PATH
echo "$(brew --prefix coreutils)/libexec/gnubin" >> $GITHUB_PATH
Expand Down Expand Up @@ -134,6 +135,7 @@ jobs:
automake \
[email protected] \
ninja \
golang \
gnu-sed --force
echo "$(brew --prefix ccache)/bin" >> $GITHUB_PATH
echo "$(brew --prefix coreutils)/libexec/gnubin" >> $GITHUB_PATH
Expand Down Expand Up @@ -215,6 +217,7 @@ jobs:
automake \
[email protected] \
ninja \
golang \
gnu-sed --force
echo "$(brew --prefix ccache)/bin" >> $GITHUB_PATH
echo "$(brew --prefix coreutils)/libexec/gnubin" >> $GITHUB_PATH
Expand Down Expand Up @@ -304,4 +307,4 @@ jobs:
@${{ github.actor }}, the build for bun-${{ inputs.tag }} failed.
**[View logs](${{ github.event.workflow_run.html_url }})**
**[View logs](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})**
2 changes: 1 addition & 1 deletion .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ jobs:
@${{ github.actor }}, the build for bun-${{ inputs.tag }} failed.
**[View logs](${{ github.event.workflow_run.html_url }})**
**[View logs](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})**
10 changes: 5 additions & 5 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ on:

env:
# Must specify exact version of LLVM for Windows
LLVM_VERSION: 16.0.6
LLVM_VERSION: 17.0.6
BUN_VERSION: 1.1.2

jobs:
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
key: bun-${{ inputs.tag }}-deps-${{ steps.hash.outputs.hash }}
- if: ${{ inputs.no-cache || !steps.cache.outputs.cache-hit }}
name: Install LLVM
uses: KyleMayes/install-llvm-action@1a3da29f56261a1e1f937ec88f0856a9b8321d7e
uses: KyleMayes/install-llvm-action@8b37482c5a2997a3ab5dbf6561f8109e2eaa7d3b
with:
version: ${{ env.LLVM_VERSION }}
- if: ${{ inputs.no-cache || !steps.cache.outputs.cache-hit }}
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
with:
submodules: recursive
- name: Install LLVM
uses: KyleMayes/install-llvm-action@1a3da29f56261a1e1f937ec88f0856a9b8321d7e
uses: KyleMayes/install-llvm-action@8b37482c5a2997a3ab5dbf6561f8109e2eaa7d3b
with:
version: ${{ env.LLVM_VERSION }}
- name: Install Ninja
Expand Down Expand Up @@ -224,7 +224,7 @@ jobs:
with:
submodules: recursive
- name: Install LLVM
uses: KyleMayes/install-llvm-action@1a3da29f56261a1e1f937ec88f0856a9b8321d7e
uses: KyleMayes/install-llvm-action@8b37482c5a2997a3ab5dbf6561f8109e2eaa7d3b
with:
version: ${{ env.LLVM_VERSION }}
- name: Install Ninja
Expand Down Expand Up @@ -334,4 +334,4 @@ jobs:
@${{ github.actor }}, the build for bun-${{ inputs.tag }} failed.
**[View logs](${{ github.event.workflow_run.html_url }})**
**[View logs](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})**
2 changes: 1 addition & 1 deletion .github/workflows/build-zig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
inputs:
runs-on:
type: string
default: ${{ github.repository_owner != 'oven-sh' && 'ubuntu-latest' || inputs.arch == 'x64' && 'namespace-profile-bun-ci-linux-x64' || 'namespace-profile-bun-ci-linux-aarch64' }}
default: ${{ github.repository_owner != 'oven-sh' && 'ubuntu-latest' || inputs.only-zig && 'namespace-profile-bun-ci-linux-x64' || inputs.arch == 'x64' && 'namespace-profile-bun-ci-linux-x64' || 'namespace-profile-bun-ci-linux-aarch64' }}
tag:
type: string
required: true
Expand Down
66 changes: 41 additions & 25 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ permissions:
actions: write

concurrency:
group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}
group: ${{ github.workflow }}-${{ github.event_name == 'workflow_dispatch' && inputs.run-id || github.ref }}
cancel-in-progress: true

on:
Expand All @@ -15,13 +15,21 @@ on:
type: string
description: The workflow ID to download artifacts (skips the build step)
pull_request:
paths-ignore:
- .vscode/**/*
- docs/**/*
- examples/**/*
push:
branches:
- main
paths-ignore:
- .vscode/**/*
- docs/**/*
- examples/**/*

jobs:
format:
if: ${{ !github.event.inputs.run-id }}
if: ${{ !inputs.run-id }}
name: Format
uses: ./.github/workflows/run-format.yml
secrets: inherit
Expand All @@ -30,12 +38,12 @@ jobs:
permissions:
contents: write
lint:
if: ${{ !github.event.inputs.run-id }}
if: ${{ !inputs.run-id }}
name: Lint
uses: ./.github/workflows/run-lint.yml
secrets: inherit
linux-x64:
if: ${{ !github.event.inputs.run-id }}
if: ${{ !inputs.run-id }}
name: Build linux-x64
uses: ./.github/workflows/build-linux.yml
secrets: inherit
Expand All @@ -44,8 +52,9 @@ jobs:
tag: linux-x64
arch: x64
cpu: haswell
canary: true
linux-x64-baseline:
if: ${{ !github.event.inputs.run-id }}
if: ${{ !inputs.run-id }}
name: Build linux-x64-baseline
uses: ./.github/workflows/build-linux.yml
secrets: inherit
Expand All @@ -54,8 +63,9 @@ jobs:
tag: linux-x64-baseline
arch: x64
cpu: nehalem
canary: true
linux-aarch64:
if: ${{ !github.event.inputs.run-id && github.repository_owner == 'oven-sh' }}
if: ${{ !inputs.run-id && github.repository_owner == 'oven-sh' }}
name: Build linux-aarch64
uses: ./.github/workflows/build-linux.yml
secrets: inherit
Expand All @@ -64,38 +74,42 @@ jobs:
tag: linux-aarch64
arch: aarch64
cpu: native
canary: true
darwin-x64:
if: ${{ !github.event.inputs.run-id }}
if: ${{ !inputs.run-id }}
name: Build darwin-x64
uses: ./.github/workflows/build-darwin.yml
secrets: inherit
with:
runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-12-large' || 'macos-12' }}
runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-13-large' || 'macos-13' }}
tag: darwin-x64
arch: x64
cpu: haswell
canary: true
darwin-x64-baseline:
if: ${{ !github.event.inputs.run-id }}
if: ${{ !inputs.run-id }}
name: Build darwin-x64-baseline
uses: ./.github/workflows/build-darwin.yml
secrets: inherit
with:
runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-12-large' || 'macos-12' }}
runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-13-large' || 'macos-13' }}
tag: darwin-x64-baseline
arch: x64
cpu: nehalem
canary: true
darwin-aarch64:
if: ${{ !github.event.inputs.run-id }}
if: ${{ !inputs.run-id }}
name: Build darwin-aarch64
uses: ./.github/workflows/build-darwin.yml
secrets: inherit
with:
runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-darwin-aarch64' || 'macos-14' }}
runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-darwin-aarch64' || 'macos-13' }}
tag: darwin-aarch64
arch: aarch64
cpu: native
canary: true
windows-x64:
if: ${{ !github.event.inputs.run-id }}
if: ${{ !inputs.run-id }}
name: Build windows-x64
uses: ./.github/workflows/build-windows.yml
secrets: inherit
Expand All @@ -104,8 +118,9 @@ jobs:
tag: windows-x64
arch: x64
cpu: haswell
canary: true
windows-x64-baseline:
if: ${{ !github.event.inputs.run-id }}
if: ${{ !inputs.run-id }}
name: Build windows-x64-baseline
uses: ./.github/workflows/build-windows.yml
secrets: inherit
Expand All @@ -114,8 +129,9 @@ jobs:
tag: windows-x64-baseline
arch: x64
cpu: nehalem
canary: true
linux-x64-test:
if: ${{ github.event.inputs.run-id && always() || github.event_name == 'pull_request' }}
if: ${{ inputs.run-id && always() || github.event_name == 'pull_request' }}
name: Test linux-x64
needs: linux-x64
uses: ./.github/workflows/run-test.yml
Expand All @@ -126,7 +142,7 @@ jobs:
runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-linux-x64' || 'ubuntu-latest' }}
tag: linux-x64
linux-x64-baseline-test:
if: ${{ github.event.inputs.run-id && always() || github.event_name == 'pull_request' }}
if: ${{ inputs.run-id && always() || github.event_name == 'pull_request' }}
name: Test linux-x64-baseline
needs: linux-x64-baseline
uses: ./.github/workflows/run-test.yml
Expand All @@ -137,7 +153,7 @@ jobs:
runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-linux-x64' || 'ubuntu-latest' }}
tag: linux-x64-baseline
linux-aarch64-test:
if: ${{ github.event.inputs.run-id && always() || github.event_name == 'pull_request' && github.repository_owner == 'oven-sh'}}
if: ${{ inputs.run-id && always() || github.event_name == 'pull_request' && github.repository_owner == 'oven-sh'}}
name: Test linux-aarch64
needs: linux-aarch64
uses: ./.github/workflows/run-test.yml
Expand All @@ -148,40 +164,40 @@ jobs:
runs-on: namespace-profile-bun-ci-linux-aarch64
tag: linux-aarch64
darwin-x64-test:
if: ${{ github.event.inputs.run-id && always() || github.event_name == 'pull_request' }}
if: ${{ inputs.run-id && always() || github.event_name == 'pull_request' }}
name: Test darwin-x64
needs: darwin-x64
uses: ./.github/workflows/run-test.yml
secrets: inherit
with:
run-id: ${{ inputs.run-id }}
pr-number: ${{ github.event.number }}
runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-12-large' || 'macos-12' }}
runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-13-large' || 'macos-13' }}
tag: darwin-x64
darwin-x64-baseline-test:
if: ${{ github.event.inputs.run-id && always() || github.event_name == 'pull_request' }}
if: ${{ inputs.run-id && always() || github.event_name == 'pull_request' }}
name: Test darwin-x64-baseline
needs: darwin-x64-baseline
uses: ./.github/workflows/run-test.yml
secrets: inherit
with:
run-id: ${{ inputs.run-id }}
pr-number: ${{ github.event.number }}
runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-12-large' || 'macos-12' }}
runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-13-large' || 'macos-13' }}
tag: darwin-x64-baseline
darwin-aarch64-test:
if: ${{ github.event.inputs.run-id && always() || github.event_name == 'pull_request' }}
if: ${{ inputs.run-id && always() || github.event_name == 'pull_request' }}
name: Test darwin-aarch64
needs: darwin-aarch64
uses: ./.github/workflows/run-test.yml
secrets: inherit
with:
run-id: ${{ inputs.run-id }}
pr-number: ${{ github.event.number }}
runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-darwin-aarch64' || 'macos-14' }}
runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-darwin-aarch64' || 'macos-13' }}
tag: darwin-aarch64
windows-x64-test:
if: ${{ github.event.inputs.run-id && always() || github.event_name == 'pull_request' }}
if: ${{ inputs.run-id && always() || github.event_name == 'pull_request' }}
name: Test windows-x64
needs: windows-x64
uses: ./.github/workflows/run-test.yml
Expand All @@ -192,7 +208,7 @@ jobs:
runs-on: windows
tag: windows-x64
windows-x64-baseline-test:
if: ${{ github.event.inputs.run-id && always() || github.event_name == 'pull_request' }}
if: ${{ inputs.run-id && always() || github.event_name == 'pull_request' }}
name: Test windows-x64-baseline
needs: windows-x64-baseline
uses: ./.github/workflows/run-test.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
else
echo -e "✅ @${{ github.actor }}, all tests passed!" > comment.md
fi
echo -e "\n**[View logs](${{ github.event.workflow_run.html_url }})**" >> comment.md
echo -e "\n**[View logs](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})**" >> comment.md
echo -e "<!-- generated-comment workflow=${{ github.workflow }} -->" >> comment.md
- name: Find Comment
id: comment
Expand Down
Loading

0 comments on commit 412c89f

Please sign in to comment.