Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 5cad872

Browse files
ci: re-enable windows CI
This commit fixes and re-enables windows CI. Upstream fixes: - devversion/rules_browsers#18 - angular/dev-infra#2966 
1 parent 63f55af commit 5cad872

File tree

3 files changed

+26
-32
lines changed

3 files changed

+26
-32
lines changed

‎.github/shared-actions/windows-bazel-test/action.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,15 @@ runs:
1818
steps:
1919
- name: Initialize WSL
2020
id: init_wsl
21-
uses: angular/dev-infra/github-actions/setup-wsl@7f2c99469dcf64fd466abf6cb53bede791d7599d
21+
uses: alan-agius4/dev-infra/github-actions/setup-wsl@5c5f2e948c4946fa65ccce4f198862450316400b
2222
with:
2323
wsl_firewall_interface: 'vEthernet (WSL (Hyper-V firewall))'
24-
25-
- name: Installing pnpm (in WSL)
26-
run: npm install -g pnpm@9
27-
shell: wsl-bash {0}
28-
29-
- name: Install node modules in WSL (re-using from previous install/cache restore)
30-
run: |
31-
cd ${{steps.init_wsl.outputs.repo_path}}
32-
pnpm install --frozen-lockfile
33-
shell: wsl-bash {0}
34-
3524
- name: Build test binary for Windows (inside WSL)
3625
shell: wsl-bash {0}
3726
run: |
27+
export NVM_DIR="$HOME/.nvm"
28+
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
29+
3830
cd ${{steps.init_wsl.outputs.repo_path}}
3931
pnpm bazel \
4032
build --config=e2e //tests/legacy-cli:${{inputs.test_target_name}} --platforms=tools:windows_x64
@@ -54,6 +46,9 @@ runs:
5446
- name: Convert symlinks for Windows host
5547
shell: wsl-bash {0}
5648
run: |
49+
export NVM_DIR="$HOME/.nvm"
50+
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
51+
5752
cd ${{steps.init_wsl.outputs.repo_path}}
5853
5954
runfiles_dir="/mnt/c/test/dist/bin/tests/legacy-cli/${{inputs.test_target_name}}_/${{inputs.test_target_name}}.bat.runfiles"

‎.github/workflows/pr.yml

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -127,24 +127,23 @@ jobs:
127127
- name: Run CLI E2E tests
128128
run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
129129

130-
# Temporarily disabled due to https://github.com/Vampire/setup-wsl/issues/76.
131-
# e2e-windows-subset:
132-
# needs: build
133-
# runs-on: windows-2025
134-
# steps:
135-
# - name: Initialize environment
136-
# uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@59c46175bf3a8870c0c2ceb9de1eb741fd50d415
137-
# - name: Setup Bazel
138-
# uses: angular/dev-infra/github-actions/bazel/setup@59c46175bf3a8870c0c2ceb9de1eb741fd50d415
139-
# - name: Setup Bazel RBE
140-
# uses: angular/dev-infra/github-actions/bazel/configure-remote@59c46175bf3a8870c0c2ceb9de1eb741fd50d415
141-
# with:
142-
# allow_windows_rbe: true
143-
# - name: Run CLI E2E tests
144-
# uses: ./.github/shared-actions/windows-bazel-test
145-
# with:
146-
# test_target_name: e2e_node22
147-
# test_args: --esbuild --glob "tests/basic/{build,rebuild}.ts"
130+
e2e-windows-subset:
131+
needs: build
132+
runs-on: windows-2025
133+
steps:
134+
- name: Initialize environment
135+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@59c46175bf3a8870c0c2ceb9de1eb741fd50d415
136+
- name: Setup Bazel
137+
uses: angular/dev-infra/github-actions/bazel/setup@59c46175bf3a8870c0c2ceb9de1eb741fd50d415
138+
- name: Setup Bazel RBE
139+
uses: angular/dev-infra/github-actions/bazel/configure-remote@59c46175bf3a8870c0c2ceb9de1eb741fd50d415
140+
with:
141+
allow_windows_rbe: true
142+
- name: Run CLI E2E tests
143+
uses: ./.github/shared-actions/windows-bazel-test
144+
with:
145+
test_target_name: e2e_node22
146+
test_args: --esbuild --glob "tests/basic/{build,rebuild}.ts"
148147

149148
e2e-package-managers:
150149
needs: build

‎WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ http_archive(
281281

282282
git_repository(
283283
name = "rules_browsers",
284-
commit = "56ef8007ea07cd1916429bca8bb523433b0e9cdc",
285-
remote = "https://github.com/devversion/rules_browsers.git",
284+
commit = "add7995fefdb3c1ee3113bf40608321eacb5574d",
285+
remote = "https://github.com/alan-agius4/rules_browsers.git",
286286
)
287287

288288
load("@rules_browsers//setup:step_1.bzl", "rules_browsers_setup_1")

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /