Skip to content

Commit 2a158f8

Browse files
committed
upgrade zls comit, zig-bootstrap commit
1 parent 666a341 commit 2a158f8

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/workflows/bun_ci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@ on:
33
pull_request:
44
push:
55
branches:
6+
- master
67
- 014-dev
7-
- pfg/update-zig-6
8+
- pfg/update-zig-10
89
concurrency:
910
group: ${{ github.head_ref || github.run_id }}-${{ github.actor }}
1011
cancel-in-progress: true
1112
permissions:
1213
contents: read
1314
jobs:
1415
build:
16+
# TODO: cache llvm builds, these are the slowest part of the build. This requires editing the zig-bootstrap build script.
1517
runs-on: linux-arm64-gh
1618
strategy:
1719
matrix:
@@ -27,18 +29,16 @@ jobs:
2729
- uses: actions/checkout@v4
2830
with:
2931
repository: ziglang/zig-bootstrap
30-
ref: 03a95efaf981b9cee59af8027304c37a59d36fc0
32+
ref: 6442c8c9c7fa9dde3439d0d6347c2b4777ed2d60
3133
- run: rm -rf zig
3234
- uses: actions/checkout@v4
3335
with:
3436
path: zig
35-
- run: sed -i 's/ZIG_VERSION="0.14.0-dev.3299+31f353cd9"/ZIG_VERSION="0.14.1"/' build
37+
- run: sed -i 's/ZIG_VERSION="0.15.0-dev.769+4d7980645"/ZIG_VERSION="0.15.0-dev.852+8a57814bb"/' build
3638
- run: sed -i 's/Doptimize=ReleaseFast/Doptimize=ReleaseSafe/' build
3739
if: matrix.safe == 'true'
3840
- run: sed -i 's/Dstrip/Ddebug-extensions/' build
3941
if: matrix.safe == 'true'
40-
- run: sed -i 's/max_rss = 7_800_000_000/max_rss = 9_000_000_000/' zig/build.zig
41-
if: matrix.safe == 'true'
4242
- run: cat build
4343
- run: CMAKE_GENERATOR=Ninja ./build ${{ matrix.target }} baseline
4444
- uses: actions/upload-artifact@v4
@@ -54,7 +54,7 @@ jobs:
5454
- uses: actions/checkout@v4
5555
with:
5656
repository: zigtools/zls
57-
ref: 7485feeeda45d1ad09422ae83af73307ab9e6c9e
57+
ref: 706e08fc80e6c21650f54e5aab91dbe8fb441f0f
5858
- uses: actions/download-artifact@v4
5959
- name: chmod
6060
run: |

0 commit comments

Comments
 (0)