From 6fe04409a7966a85ba4a2bc084258783bd525b00 Mon Sep 17 00:00:00 2001 From: Fabian Meumertzheim Date: Thu, 23 May 2024 11:31:41 +0200 Subject: [PATCH 1/3] Use bazelisk in all GitHub workflows --- .github/workflows/build-windows-github-release-artifacts.yaml | 4 ++-- .github/workflows/website-pr.yaml | 2 +- .github/workflows/website.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-windows-github-release-artifacts.yaml b/.github/workflows/build-windows-github-release-artifacts.yaml index bcfb2c99504..70d50861877 100644 --- a/.github/workflows/build-windows-github-release-artifacts.yaml +++ b/.github/workflows/build-windows-github-release-artifacts.yaml @@ -40,8 +40,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | bazelisk --output_user_root=D:/0 build --config=release-windows --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_ORG_API_KEY }} //enterprise/server/cmd/executor:executor - $execution_root = bazel.exe --output_user_root=D:/0 info execution_root - $artifact_rel_path = bazel.exe --output_user_root=D:/0 cquery --config=release-windows --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_ORG_API_KEY }} --output=files //enterprise/server/cmd/executor:executor + $execution_root = bazelisk --output_user_root=D:/0 info execution_root + $artifact_rel_path = bazelisk --output_user_root=D:/0 cquery --config=release-windows --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_ORG_API_KEY }} --output=files //enterprise/server/cmd/executor:executor $artifact_abs_path = "${execution_root}\${artifact_rel_path}" Copy-Item -Path $artifact_abs_path -Destination executor-enterprise-windows-amd64-beta.exe gh release upload ${{ inputs.version_tag }} executor-enterprise-windows-amd64-beta.exe --clobber diff --git a/.github/workflows/website-pr.yaml b/.github/workflows/website-pr.yaml index b9bbe4e8c87..17c487f646e 100644 --- a/.github/workflows/website-pr.yaml +++ b/.github/workflows/website-pr.yaml @@ -25,4 +25,4 @@ jobs: if [[ "$API_KEY" ]]; then API_KEY_ARGS=("--remote_header=x-buildbuddy-api-key=$API_KEY") fi - bazel build //website:website --config=ci "${API_KEY_ARGS[@]}" + bazelisk build //website:website --config=ci "${API_KEY_ARGS[@]}" diff --git a/.github/workflows/website.yaml b/.github/workflows/website.yaml index a0ae664d0d0..3e9f2e52276 100644 --- a/.github/workflows/website.yaml +++ b/.github/workflows/website.yaml @@ -21,7 +21,7 @@ jobs: - name: Build Website run: | - bazel build //website:website --config=ci --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_ORG_API_KEY }} + bazelisk build //website:website --config=ci --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_ORG_API_KEY }} rm -rf website/build mkdir -p website/build cd website/build From 879cdf92ad6158d4280d72fe2cdf63c6f4202f22 Mon Sep 17 00:00:00 2001 From: Fabian Meumertzheim Date: Thu, 23 May 2024 14:08:34 +0200 Subject: [PATCH 2/3] Test Windows release build --- .github/workflows/build-windows-github-release-artifacts.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-windows-github-release-artifacts.yaml b/.github/workflows/build-windows-github-release-artifacts.yaml index 70d50861877..360ebc5d650 100644 --- a/.github/workflows/build-windows-github-release-artifacts.yaml +++ b/.github/workflows/build-windows-github-release-artifacts.yaml @@ -1,6 +1,7 @@ name: "Build Windows Github Release Artifacts" on: + pull_request: workflow_dispatch: inputs: release_branch: @@ -44,4 +45,3 @@ jobs: $artifact_rel_path = bazelisk --output_user_root=D:/0 cquery --config=release-windows --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_ORG_API_KEY }} --output=files //enterprise/server/cmd/executor:executor $artifact_abs_path = "${execution_root}\${artifact_rel_path}" Copy-Item -Path $artifact_abs_path -Destination executor-enterprise-windows-amd64-beta.exe - gh release upload ${{ inputs.version_tag }} executor-enterprise-windows-amd64-beta.exe --clobber From 4bcba9abb278b7e53ea028219505fefe0be7ed49 Mon Sep 17 00:00:00 2001 From: Fabian Meumertzheim Date: Thu, 23 May 2024 14:23:12 +0200 Subject: [PATCH 3/3] Update build-windows-github-release-artifacts.yaml --- .github/workflows/build-windows-github-release-artifacts.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-windows-github-release-artifacts.yaml b/.github/workflows/build-windows-github-release-artifacts.yaml index 360ebc5d650..70d50861877 100644 --- a/.github/workflows/build-windows-github-release-artifacts.yaml +++ b/.github/workflows/build-windows-github-release-artifacts.yaml @@ -1,7 +1,6 @@ name: "Build Windows Github Release Artifacts" on: - pull_request: workflow_dispatch: inputs: release_branch: @@ -45,3 +44,4 @@ jobs: $artifact_rel_path = bazelisk --output_user_root=D:/0 cquery --config=release-windows --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_ORG_API_KEY }} --output=files //enterprise/server/cmd/executor:executor $artifact_abs_path = "${execution_root}\${artifact_rel_path}" Copy-Item -Path $artifact_abs_path -Destination executor-enterprise-windows-amd64-beta.exe + gh release upload ${{ inputs.version_tag }} executor-enterprise-windows-amd64-beta.exe --clobber