bazel
/
bazel-lib
mirror of https://github.com/bazel-contrib/bazel-lib
2
0
Fork 0
Code Issues Releases Activity

chore: green up Windows CI (#643)

This commit is contained in:
Greg Magolan 2023-11-07 14:01:45 -08:00 committed by GitHub
parent 7551e5c087
commit fe2d31870c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bazeliskrc
View File

@ -1,2 +1,2 @@
BAZELISK_BASE_URL=https://github.com/aspect-build/aspect-cli/releases/download BAZELISK_BASE_URL=https://github.com/aspect-build/aspect-cli/releases/download
USE_BAZEL_VERSION=aspect/5.7.2 USE_BAZEL_VERSION=aspect/5.8.5

2
.bcr/presubmit.yml
View File

@ -6,5 +6,7 @@ bcr_test_module:
run_tests: run_tests:
name: "Run test module" name: "Run test module"
platform: ${{ platform }} platform: ${{ platform }}
environment:
BAZELISK_BASE_URL: "https://github.com/bazelbuild/bazel/releases/download/"
test_targets: test_targets:
- "//..." - "//..."

10
.github/workflows/ci.yaml vendored
View File

@ -121,10 +121,10 @@ jobs:
- name: Configure Bazel version - name: Configure Bazel version
if: ${{ matrix.os != 'windows-latest' }} if: ${{ matrix.os != 'windows-latest' }}
working-directory: ${{ matrix.folder }} working-directory: ${{ matrix.folder }}
# Overwrite the .bazelversion instead of using USE_BAZEL_VERSION so that Bazelisk # - Overwrite the .bazelversion instead of using USE_BAZEL_VERSION so that Bazelisk
# still bootstraps Aspect CLI from configuration in .bazeliskrc. Aspect CLI will # still bootstraps Aspect CLI from configuration in .bazeliskrc. Aspect CLI will
# then use .bazelversion to determine which Bazel version to use. # then use .bazelversion to determine which Bazel version to use.
# Also delete the .aspect/bazelrc/bazel6.bazelrc file if we are not testing # - Delete the .aspect/bazelrc/bazel6.bazelrc file if we are not testing
# against Bazel 6 which has a try-import in the root .bazelrc for local development. # against Bazel 6 which has a try-import in the root .bazelrc for local development.
run: | run: |
BAZEL_VERSION=${{ matrix.bazelversion }} BAZEL_VERSION=${{ matrix.bazelversion }}
@ -134,17 +134,19 @@ jobs:
- name: Configure Bazel version (Windows) - name: Configure Bazel version (Windows)
if: ${{ matrix.os == 'windows-latest' }} if: ${{ matrix.os == 'windows-latest' }}
working-directory: ${{ matrix.folder }} working-directory: ${{ matrix.folder }}
# Overwrite the .bazelversion instead of using USE_BAZEL_VERSION so that Bazelisk # - Overwrite the .bazelversion instead of using USE_BAZEL_VERSION so that Bazelisk
# still bootstraps Aspect CLI from configuration in .bazeliskrc. Aspect CLI will # still bootstraps Aspect CLI from configuration in .bazeliskrc. Aspect CLI will
# then use .bazelversion to determine which Bazel version to use. # then use .bazelversion to determine which Bazel version to use.
# Also delete the .aspect/bazelrc/bazel6.bazelrc file if we are not testing # - Delete the .aspect/bazelrc/bazel6.bazelrc file if we are not testing
# against Bazel 6 which has a try-import in the root .bazelrc for local development. # against Bazel 6 which has a try-import in the root .bazelrc for local development.
# - Delete the .bazeliskrc file since Aspect CLI doesn't current ship Windows binaries
run: | run: |
echo "${{ matrix.bazelversion }}" > .bazelversion echo "${{ matrix.bazelversion }}" > .bazelversion
$BAZEL_MAJOR_VERSION = "${{ matrix.bazelversion }}".substring(0, 1) $BAZEL_MAJOR_VERSION = "${{ matrix.bazelversion }}".substring(0, 1)
if ($BAZEL_MAJOR_VERSION -ne "6") { if ($BAZEL_MAJOR_VERSION -ne "6") {
rm -Force .aspect/bazelrc/bazel6.bazelrc rm -Force .aspect/bazelrc/bazel6.bazelrc
} }
rm -Force .bazeliskrc
- name: Set bzlmod flag - name: Set bzlmod flag
# Store the --enable_bzlmod flag that we add to the test command below # Store the --enable_bzlmod flag that we add to the test command below

1
e2e/copy_to_directory/.bazeliskrc Symbolic link
View File

@ -0,0 +1 @@
../../.bazeliskrc

1
e2e/coreutils/.bazeliskrc Symbolic link
View File

@ -0,0 +1 @@
../../.bazeliskrc

1
e2e/external_copy_to_directory/.bazeliskrc Symbolic link
View File

@ -0,0 +1 @@
../../.bazeliskrc

1
e2e/smoke/.bazeliskrc Symbolic link
View File

@ -0,0 +1 @@
../../.bazeliskrc

1
e2e/write_source_files/.bazeliskrc Symbolic link
View File

@ -0,0 +1 @@
../../.bazeliskrc