Skip to content

Commit e2c2f99

Browse files
authored
chore: remove use of aspect-cli via bazeliskrc (#180)
### Changes are visible to end-users: no ### Test plan - Covered by existing test cases
1 parent 553b3ea commit e2c2f99

2 files changed

Lines changed: 1 addition & 10 deletions

File tree

.bazeliskrc

Lines changed: 0 additions & 2 deletions
This file was deleted.

.github/workflows/ci.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
~/.cache/bazel-disk-cache
109109
~/.cache/bazel-repository-cache
110110
~/.cache/xdg-cache
111-
key: bazel-cache-${{ matrix.bazel-version.version }}-${{ matrix.bzlmod }}-${{ matrix.os }}-${{ matrix.folder }}-${{ hashFiles('.bazelrc', '.bazelversion', '.bazeliskrc', '**/BUILD', '**/BUILD.bazel', '**/*.bzl', 'WORKSPACE', 'WORKSPACE.bazel', 'WORKSPACE.bzlmod', 'MODULE.bazel') }}
111+
key: bazel-cache-${{ matrix.bazel-version.version }}-${{ matrix.bzlmod }}-${{ matrix.os }}-${{ matrix.folder }}-${{ hashFiles('.bazelrc', '.bazelversion', '**/BUILD', '**/BUILD.bazel', '**/*.bzl', 'WORKSPACE', 'WORKSPACE.bazel', 'WORKSPACE.bzlmod', 'MODULE.bazel') }}
112112
restore-keys: bazel-cache-${{ matrix.bazel-version.version }}-${{ matrix.bzlmod }}-${{ matrix.os }}-${{ matrix.folder }}-
113113

114114
- name: Configure Bazel version
@@ -125,13 +125,6 @@ jobs:
125125
# bring in the version specific bazelrc file with --bazelrc when we invoke bazel.
126126
rm ${GITHUB_WORKSPACE//\\/\/}/.aspect/bazelrc/bazel*.bazelrc
127127
128-
# TODO: remove this block once we have Aspect CLI Windows releases
129-
- name: Don't use Aspect CLI on Windows
130-
if: matrix.os == 'windows'
131-
working-directory: ${{ matrix.folder }}
132-
shell: bash
133-
run: rm -f .bazeliskrc
134-
135128
- name: bazel test //...
136129
working-directory: ${{ matrix.folder }}
137130
shell: bash

0 commit comments

Comments
 (0)