From 6f69368b01be2ac323bcdbf69d7cde2f4be343a8 Mon Sep 17 00:00:00 2001 From: Alex Trotta Date: Thu, 2 Jul 2026 15:26:53 -0400 Subject: [PATCH 1/3] ci: Misc fixes/modernization - We don't have a Buildbuddy key for this repo - Update actions and pin to SHAs - Remove old Mac images --- .github/workflows/build.yml | 14 +++++++------- .github/workflows/release.yml | 28 +++++++++++++--------------- bazel/setup-ci.sh | 4 +++- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0a3333af..2dd863e9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,13 +13,13 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@4f1f4aec02e41874fa0262ea8ff5172d7978ad1e - name: Prepare for build run: | bazel/setup-ci.sh mkdir -p editors/code/dist - env: - BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }} + # env: + # BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }} - name: Build run: bazel build //... - name: Run tests @@ -28,17 +28,17 @@ jobs: build-windows: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@4f1f4aec02e41874fa0262ea8ff5172d7978ad1e - name: Prepare for build run: | echo 'import %workspace%/bazel/remote-cache.bazelrc' >>.bazelrc - echo "build --remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY" >>.bazelrc + # echo "build --remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY" >>.bazelrc echo "startup --output_user_root=C:/b" >>.bazelrc echo "startup --windows_enable_symlinks" >>.bazelrc mkdir -p editors/code/dist shell: bash - env: - BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }} + # env: + # BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }} - name: Build run: bazel build //crates/... - name: Run tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 840ca24a..daf8f2f8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,23 +16,21 @@ jobs: runs-on: ubuntu-latest - name: linux-aarch64 runs-on: ubuntu-latest - - name: darwin-amd64 - runs-on: macos-13 - name: darwin-arm64 - runs-on: macos-14 + runs-on: macos-15 fail-fast: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@4f1f4aec02e41874fa0262ea8ff5172d7978ad1e - name: Prepare for build run: | bazel/setup-ci.sh mkdir -p editors/code/dist - env: - BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }} + # env: + # BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }} - name: Build run: bazel build -c opt ${{ matrix.target.name == 'linux-aarch64' && '--platforms @zig_sdk//platform:linux_arm64' || '' }} //crates/starpls - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a with: name: starpls-${{ matrix.target.name }} path: bazel-bin/crates/starpls/starpls @@ -41,20 +39,20 @@ jobs: name: Build (Windows) runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@4f1f4aec02e41874fa0262ea8ff5172d7978ad1e - name: Prepare for build run: | echo 'import %workspace%/bazel/remote-cache.bazelrc' >>.bazelrc - echo "build --remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY" >>.bazelrc + # echo "build --remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY" >>.bazelrc echo "startup --output_user_root=C:/b" >>.bazelrc echo "startup --windows_enable_symlinks" >>.bazelrc mkdir -p editors/code/dist shell: bash - env: - BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }} + # env: + # BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }} - name: Build run: bazel build -c opt //crates/starpls - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a with: name: starpls-windows-amd64 path: bazel-bin/crates/starpls/starpls.exe @@ -66,8 +64,8 @@ jobs: permissions: contents: write steps: - - uses: actions/checkout@v4 - - uses: actions/download-artifact@v4 + - uses: actions/checkout@4f1f4aec02e41874fa0262ea8ff5172d7978ad1e + - uses: actions/download-artifact@484a0b528fb4d7bd804637ccb632e47a0e638317 with: path: artifacts pattern: starpls-* @@ -87,7 +85,7 @@ jobs: cp starpls-linux-aarch64 starpls && tar -czvf starpls-linux-aarch64.tar.gz starpls && rm starpls cp starpls-linux-amd64 starpls && tar -czvf starpls-linux-amd64.tar.gz starpls && rm starpls cp starpls-darwin-amd64 starpls && tar -czvf starpls-darwin-amd64.tar.gz starpls && rm starpls - cp starpls-darwin-arm64 starpls && tar -czvf starpls-darwin-arm64.tar.gz starpls && rm starpls + cp starpls-darwin-arm64 starpls && tar -czvf starplload_bazel_build_languages-darwin-arm64.tar.gz starpls && rm starpls cp starpls-windows-amd64.exe starpls.exe && zip starpls-windows-amd64.zip starpls.exe && rm starpls.exe - name: Show release artifacts run: find release diff --git a/bazel/setup-ci.sh b/bazel/setup-ci.sh index 19fa5c4e..3301287e 100755 --- a/bazel/setup-ci.sh +++ b/bazel/setup-ci.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash echo 'import %workspace%/bazel/remote-cache.bazelrc' >>.bazelrc -echo "build --remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY" >>.bazelrc +if [[ -n "$BUILDBUDDY_API_KEY" ]]; then + echo "build --remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY" >>.bazelrc +fi From cb5501655d35d9477ec3802136cba5f11971bbee Mon Sep 17 00:00:00 2001 From: Alex Trotta Date: Thu, 2 Jul 2026 16:41:29 -0400 Subject: [PATCH 2/3] move other bazelrc into if --- bazel/setup-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/setup-ci.sh b/bazel/setup-ci.sh index 3301287e..c2994ed4 100755 --- a/bazel/setup-ci.sh +++ b/bazel/setup-ci.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -echo 'import %workspace%/bazel/remote-cache.bazelrc' >>.bazelrc if [[ -n "$BUILDBUDDY_API_KEY" ]]; then + echo 'import %workspace%/bazel/remote-cache.bazelrc' >>.bazelrc echo "build --remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY" >>.bazelrc fi From 737fb0a8b5fae4b7da8a4083cd1629419a438c7b Mon Sep 17 00:00:00 2001 From: Alex Trotta Date: Thu, 2 Jul 2026 18:20:52 -0400 Subject: [PATCH 3/3] fix windows --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2dd863e9..dafb0483 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: - uses: actions/checkout@4f1f4aec02e41874fa0262ea8ff5172d7978ad1e - name: Prepare for build run: | - echo 'import %workspace%/bazel/remote-cache.bazelrc' >>.bazelrc + # echo 'import %workspace%/bazel/remote-cache.bazelrc' >>.bazelrc # echo "build --remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY" >>.bazelrc echo "startup --output_user_root=C:/b" >>.bazelrc echo "startup --windows_enable_symlinks" >>.bazelrc diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index daf8f2f8..e169879b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,7 @@ jobs: - uses: actions/checkout@4f1f4aec02e41874fa0262ea8ff5172d7978ad1e - name: Prepare for build run: | - echo 'import %workspace%/bazel/remote-cache.bazelrc' >>.bazelrc + # echo 'import %workspace%/bazel/remote-cache.bazelrc' >>.bazelrc # echo "build --remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY" >>.bazelrc echo "startup --output_user_root=C:/b" >>.bazelrc echo "startup --windows_enable_symlinks" >>.bazelrc