Commit f56f4fa
chore(ci): remove Chocolatey from Windows bootstrap (#25254)
* chore(ci): remove Chocolatey from Windows bootstrap
Install protoc directly from the upstream GitHub release (matching the
pinned version used on Linux/macOS in scripts/environment/install-protoc.sh)
instead of going through Chocolatey. GNU make is already on the default
PATH of the windows-2025 runner image via C:\mingw64\bin, so no extra
install step is needed for it.
This eliminates the recurring "Chocolatey installed 0/0 packages"
failures caused by Chocolatey CDN blips, and pins the Windows build to
the same protoc version used on Linux/macOS.
Verified on the ci-sandbox repo:
- protoc resolves to $RUNNER_TEMP\protoc\bin\protoc.exe -> libprotoc 3.21.12
- make resolves to C:\mingw64\bin\make.exe -> GNU Make 4.4.1
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore(ci): share install-protoc.sh across platforms
Extend the existing Linux/macOS protoc installer with MINGW/MSYS
platform detection and .exe handling, and have bootstrap-windows-2025.ps1
delegate to it via Git Bash. This replaces the inline PowerShell
download introduced earlier and makes all three platforms pin the same
protoc version from the same upstream source.
Also adds curl --retry 5 --retry-delay 10 --retry-all-errors so
transient download blips are retried without extra scaffolding.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore(ci): drop curl --retry-all-errors for focal compatibility
The ghcr.io/cross-rs/* base images used by scripts/cross/Dockerfile are
Ubuntu 20.04 focal, which ships curl 7.68.x. --retry-all-errors was
added in curl 7.71.0, so it would be rejected as an unknown option and
break cross-target builds that run install-protoc.sh inside those
images.
Plain --retry 5 --retry-delay 10 still handles the transport-level
retries that cover the CDN blips we care about.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>1 parent c0cdf20 commit f56f4fa
2 files changed
Lines changed: 39 additions & 40 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | 5 | | |
32 | 6 | | |
33 | 7 | | |
| |||
37 | 11 | | |
38 | 12 | | |
39 | 13 | | |
40 | | - | |
41 | | - | |
42 | | - | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
43 | 27 | | |
44 | 28 | | |
45 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
33 | 32 | | |
34 | 33 | | |
35 | 34 | | |
| |||
47 | 46 | | |
48 | 47 | | |
49 | 48 | | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
50 | 57 | | |
51 | 58 | | |
52 | 59 | | |
53 | 60 | | |
54 | 61 | | |
55 | 62 | | |
56 | | - | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
57 | 69 | | |
58 | 70 | | |
59 | 71 | | |
60 | | - | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
61 | 76 | | |
62 | 77 | | |
63 | | - | |
| 78 | + | |
64 | 79 | | |
65 | 80 | | |
66 | | - | |
| 81 | + | |
0 commit comments