Skip to content

Commit 197682f

Browse files
alexeaglealexeagle
authored
refactor: remove old aspect CLI (#2434)
Also reduce duplication in AW config Prep for adding testing on Bazel 9
1 parent 3ba5536 commit 197682f

File tree

5 files changed

+88
-272
lines changed

5 files changed

+88
-272
lines changed

‎.aspect/workflows/config.yaml‎

Lines changed: 48 additions & 225 deletions
Original file line numberDiff line numberDiff line change
@@ -5,312 +5,122 @@ workspaces:
55
label: rules_js
66
e2e/bzlmod:
77
icon: bazel
8-
tasks:
8+
tasks: &e2e_tasks
99
- test:
1010
queue: aspect-medium
1111
- format:
1212
without: true
1313
- buildifier:
1414
without: true
15+
- bazel-8:
16+
without: true
1517
e2e/git_dep_metadata:
1618
icon: npm
17-
tasks:
18-
- test:
19-
queue: aspect-medium
20-
- format:
21-
without: true
22-
- buildifier:
23-
without: true
19+
tasks: *e2e_tasks
2420
e2e/gyp_no_install_script:
2521
icon: npm
26-
tasks:
27-
- test:
28-
queue: aspect-medium
29-
- format:
30-
without: true
31-
- buildifier:
32-
without: true
22+
tasks: *e2e_tasks
3323
# rules_docker not compatible with Bazel 7.
3424
# See https://github.com/bazelbuild/bazel/issues/20494#issuecomment-1852401451.
3525
# e2e/js_image_docker:
3626
e2e/js_image_oci:
3727
icon: linux
38-
tasks:
39-
- test:
40-
queue: aspect-medium
41-
- format:
42-
without: true
43-
- buildifier:
44-
without: true
28+
tasks: *e2e_tasks
4529
# No test targets. Requires running test.sh.
4630
# e2e/js_run_devserver:
4731
e2e/npm_link_package:
4832
icon: npm
49-
tasks:
50-
- test:
51-
queue: aspect-medium
52-
- format:
53-
without: true
54-
- buildifier:
55-
without: true
33+
tasks: *e2e_tasks
5634
e2e/npm_link_package-esm:
5735
icon: npm
58-
tasks:
59-
- test:
60-
queue: aspect-medium
61-
- format:
62-
without: true
63-
- buildifier:
64-
without: true
36+
tasks: *e2e_tasks
6537
e2e/npm_link_package-rerooted:
6638
icon: npm
67-
tasks:
68-
- test:
69-
queue: aspect-medium
70-
- format:
71-
without: true
72-
- buildifier:
73-
without: true
39+
tasks: *e2e_tasks
7440
e2e/npm_translate_lock:
7541
icon: npm
76-
tasks:
77-
- test:
78-
queue: aspect-medium
79-
- format:
80-
without: true
81-
- buildifier:
82-
without: true
42+
tasks: *e2e_tasks
8343
e2e/npm_translate_lock_replace_packages:
8444
icon: npm
85-
tasks:
86-
- test:
87-
queue: aspect-medium
88-
- format:
89-
without: true
90-
- buildifier:
91-
without: true
45+
tasks: *e2e_tasks
9246
e2e/npm_translate_lock_empty:
9347
icon: npm
94-
tasks:
95-
- test:
96-
queue: aspect-medium
97-
- format:
98-
without: true
99-
- buildifier:
100-
without: true
48+
tasks: *e2e_tasks
10149
e2e/npm_translate_lock_exclude_package_contents:
10250
icon: npm
103-
tasks:
104-
- test:
105-
queue: aspect-medium
106-
- format:
107-
without: true
108-
- buildifier:
109-
without: true
51+
tasks: *e2e_tasks
11052
e2e/npm_translate_lock_multi:
11153
icon: npm
112-
tasks:
113-
- test:
114-
queue: aspect-medium
115-
- format:
116-
without: true
117-
- buildifier:
118-
without: true
54+
tasks: *e2e_tasks
11955
e2e/npm_translate_lock_partial_clone:
12056
icon: npm
121-
tasks:
122-
- test:
123-
queue: aspect-medium
124-
- format:
125-
without: true
126-
- buildifier:
127-
without: true
57+
tasks: *e2e_tasks
12858
# No test targets. Requires running test.sh.
12959
# e2e/npm_translate_lock_package_visibility:
13060
e2e/npm_translate_lock_subdir_patch:
13161
icon: npm
132-
tasks:
133-
- test:
134-
queue: aspect-medium
135-
- format:
136-
without: true
137-
- buildifier:
138-
without: true
62+
tasks: *e2e_tasks
13963
# Requires an auth token
14064
# e2e/npm_translate_lock_auth:
14165
e2e/npm_translate_lock_disable_hooks:
14266
icon: npm
143-
tasks:
144-
- test:
145-
queue: aspect-medium
146-
- format:
147-
without: true
148-
- buildifier:
149-
without: true
67+
tasks: *e2e_tasks
15068
# Requires an SSH token
15169
# e2e/npm_translate_lock_git+ssh:
15270
e2e/npm_translate_package_lock:
15371
icon: npm
154-
tasks:
155-
- test:
156-
queue: aspect-medium
157-
- format:
158-
without: true
159-
- buildifier:
160-
without: true
72+
tasks: *e2e_tasks
16173
e2e/npm_translate_yarn_lock:
16274
icon: yarn
163-
tasks:
164-
- test:
165-
queue: aspect-medium
166-
- format:
167-
without: true
168-
- buildifier:
169-
without: true
75+
tasks: *e2e_tasks
17076
e2e/package_json_module:
17177
icon: npm
172-
tasks:
173-
- test:
174-
queue: aspect-medium
175-
- format:
176-
without: true
177-
- buildifier:
178-
without: true
78+
tasks: *e2e_tasks
17979
e2e/patch_from_repo:
18080
icon: npm
181-
tasks:
182-
- test:
183-
queue: aspect-medium
184-
- format:
185-
without: true
186-
- buildifier:
187-
without: true
81+
tasks: *e2e_tasks
18882
e2e/pnpm_lockfiles:
18983
icon: pnpm
190-
tasks:
191-
- test:
192-
queue: aspect-medium
193-
- format:
194-
without: true
195-
- buildifier:
196-
without: true
84+
tasks: *e2e_tasks
19785
e2e/pnpm_repo_install:
19886
icon: pnpm
199-
tasks:
200-
- test:
201-
queue: aspect-medium
202-
- format:
203-
without: true
204-
- buildifier:
205-
without: true
87+
tasks: *e2e_tasks
20688
e2e/pnpm_workspace:
20789
icon: pnpm
208-
tasks:
209-
- test:
210-
queue: aspect-medium
211-
- format:
212-
without: true
213-
- buildifier:
214-
without: true
90+
tasks: *e2e_tasks
21591
e2e/pnpm_workspace_deps:
21692
icon: pnpm
217-
tasks:
218-
- test:
219-
queue: aspect-medium
220-
- format:
221-
without: true
222-
- buildifier:
223-
without: true
93+
tasks: *e2e_tasks
22494
e2e/pnpm_workspace_rerooted:
22595
icon: pnpm
226-
tasks:
227-
- test:
228-
queue: aspect-medium
229-
- format:
230-
without: true
231-
- buildifier:
232-
without: true
96+
tasks: *e2e_tasks
23397
e2e/repo_mapping:
23498
icon: js
235-
tasks:
236-
- test:
237-
queue: aspect-medium
238-
- format:
239-
without: true
240-
- buildifier:
241-
without: true
99+
tasks: *e2e_tasks
242100
e2e/rules_foo:
243101
icon: js
244-
tasks:
245-
- test:
246-
queue: aspect-medium
247-
- format:
248-
without: true
249-
- buildifier:
250-
without: true
102+
tasks: *e2e_tasks
251103
e2e/runfiles:
252104
icon: js
253-
tasks:
254-
- test:
255-
queue: aspect-medium
256-
- format:
257-
without: true
258-
- buildifier:
259-
without: true
105+
tasks: *e2e_tasks
260106
e2e/stamped_package_json:
261107
icon: npm
262-
tasks:
263-
- test:
264-
queue: aspect-medium
265-
- format:
266-
without: true
267-
- buildifier:
268-
without: true
108+
tasks: *e2e_tasks
269109
e2e/vendored_node:
270110
icon: js
271-
tasks:
272-
- test:
273-
queue: aspect-medium
274-
- format:
275-
without: true
276-
- buildifier:
277-
without: true
111+
tasks: *e2e_tasks
278112
e2e/vendored_tarfile:
279113
icon: js
280-
tasks:
281-
- test:
282-
queue: aspect-medium
283-
- format:
284-
without: true
285-
- buildifier:
286-
without: true
114+
tasks: *e2e_tasks
287115
e2e/verify_patches:
288116
icon: js
289-
tasks:
290-
- test:
291-
queue: aspect-medium
292-
- format:
293-
without: true
294-
- buildifier:
295-
without: true
117+
tasks: *e2e_tasks
296118
e2e/worker:
297119
icon: js
298-
tasks:
299-
- test:
300-
queue: aspect-medium
301-
- format:
302-
without: true
303-
- buildifier:
304-
without: true
120+
tasks: *e2e_tasks
305121
e2e/workspace:
306122
icon: js
307-
tasks:
308-
- test:
309-
queue: aspect-medium
310-
- format:
311-
without: true
312-
- buildifier:
313-
without: true
123+
tasks: *e2e_tasks
314124
# No test targets. Requires running test.sh.
315125
# e2e/update_pnpm_lock:
316126
# e2e/update_pnpm_lock_with_import:
@@ -323,6 +133,19 @@ tasks:
323133
- checkout:
324134
update_strategy: rebase
325135
- test:
136+
name: Bazel 7
137+
id: bazel-7
138+
bazel:
139+
flags: ['--test_tag_filters=-skip-on-bazel7']
140+
env:
141+
USE_BAZEL_VERSION: '7.x'
142+
- test:
143+
name: Bazel 8
144+
id: bazel-8
145+
bazel:
146+
flags: ['--test_tag_filters=-skip-on-bazel8']
147+
env:
148+
USE_BAZEL_VERSION: '8.x'
326149
- format:
327150
queue: aspect-medium
328151
- buildifier:

‎.bazeliskrc‎

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

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ jobs:
261261
~/.cache/bazelisk
262262
key: >-
263263
bazel-cache-${{ matrix.bazel-version.version }}-${{ matrix.bzlmod }}-${{ matrix.os }}-${{ matrix.folder }}-
264-
${{ hashFiles('.bazelrc', '.bazelversion', '.bazeliskrc', '**/BUILD', '**/BUILD.bazel', '**/*.bzl', 'WORKSPACE', 'WORKSPACE.bazel', 'WORKSPACE.bzlmod', 'MODULE.bazel', '**/*.js', '!e2e') }}-
265-
${{ hashFiles(format('{0}/.bazelrc', matrix.folder), format('{0}/.bazelversion', matrix.folder), format('{0}/.bazeliskrc', matrix.folder), format('{0}/**/BUILD', matrix.folder), format('{0}/**/BUILD.bazel', matrix.folder), format('{0}/**/*.bzl', matrix.folder), format('{0}/WORKSPACE', matrix.folder), format('{0}/WORKSPACE.bazel', matrix.folder), format('{0}/WORKSPACE.bzlmod', matrix.folder), format('{0}/MODULE.bazel', matrix.folder), format('{0}/MODULE.bazel.lock', matrix.folder), format('{0}/**/*.js', matrix.folder)) }}
264+
${{ hashFiles('.bazelrc', '.bazelversion', '**/BUILD', '**/BUILD.bazel', '**/*.bzl', 'WORKSPACE', 'WORKSPACE.bazel', 'WORKSPACE.bzlmod', 'MODULE.bazel', '**/*.js', '!e2e') }}-
265+
${{ hashFiles(format('{0}/.bazelrc', matrix.folder), format('{0}/.bazelversion', matrix.folder), format('{0}/**/BUILD', matrix.folder), format('{0}/**/BUILD.bazel', matrix.folder), format('{0}/**/*.bzl', matrix.folder), format('{0}/WORKSPACE', matrix.folder), format('{0}/WORKSPACE.bazel', matrix.folder), format('{0}/WORKSPACE.bzlmod', matrix.folder), format('{0}/MODULE.bazel', matrix.folder), format('{0}/MODULE.bazel.lock', matrix.folder), format('{0}/**/*.js', matrix.folder)) }}
266266
restore-keys: |
267267
bazel-cache-${{ matrix.bazel-version.version }}-${{ matrix.bzlmod }}-${{ matrix.os }}-${{ matrix.folder }}-
268268
@@ -274,12 +274,6 @@ jobs:
274274
# then use .bazelversion to determine which Bazel version to use.
275275
echo "${{ matrix.bazel-version.version }}" > .bazelversion
276276
277-
# TODO: remove this block once we have Aspect CLI Windows releases
278-
- name: Don't use Aspect CLI on Windows
279-
if: matrix.os == 'windows'
280-
shell: bash
281-
run: rm -f .bazeliskrc
282-
283277
- name: bazel test //...
284278
shell: bash
285279
run: |

0 commit comments

Comments
 (0)