Skip to content

Commit 4fe0fc4

Browse files
committed
Do less CI customization, now that windows-11-arm is updated
The `windows-11-arm` image has been updated with more of the usual software present on GitHub-hosted GitHub Actions runner images for Windows, at current versions. - Git for Windows is updated to a version not suffering from GitoxideLabs#1849. So this removes the steps that had upgraded Git for Windows and checked the version before and after the upgrade. - `rustup` has been added. So this removes the helper action that installed it, and removes the `uses` step for it from the two jobs that had called it. (If either of these is needed in the future, on this or any other job, then they can be brought back from the commit history.)
1 parent 9e4e3ec commit 4fe0fc4

File tree

2 files changed

+0
-61
lines changed

2 files changed

+0
-61
lines changed

.github/actions/setup-windows-arm-rustup/action.yml

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

.github/workflows/ci.yml

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,6 @@ jobs:
221221

222222
steps:
223223
- uses: actions/checkout@v4
224-
- name: Install rustup
225-
if: matrix.os == 'windows-11-arm'
226-
uses: ./.github/actions/setup-windows-arm-rustup
227224
- uses: dtolnay/rust-toolchain@stable
228225
- uses: Swatinem/rust-cache@v2
229226
- name: cargo check default features
@@ -253,44 +250,7 @@ jobs:
253250
runs-on: ${{ matrix.os }}
254251

255252
steps:
256-
- name: Report version/build of Git in this runner image
257-
run: git version --build-options
258-
- name: Upgrade Git for Windows to latest stable release
259-
# TODO(ci): Remove this and related steps once `windows-11-arm` ships a new enough Git.
260-
# The Windows 11 ARM runner still ships Git 2.48.*, so it remains affected by #1849.
261-
if: matrix.os == 'windows-11-arm'
262-
env:
263-
GH_TOKEN: ${{ github.token }}
264-
run: |
265-
$workingDir = '~/git-dl'
266-
$repo = 'git-for-windows/git'
267-
$pattern = 'Git-*-arm64.exe'
268-
$log = 'setup-log.txt'
269-
# Inno Setup args reference: https://jrsoftware.org/ishelp/index.php?topic=setupcmdline
270-
$arguments = @(
271-
'/VERYSILENT',
272-
'/SUPPRESSMSGBOXES',
273-
'/ALLUSERS',
274-
"/LOG=$log",
275-
'/NORESTART',
276-
'/CLOSEAPPLICATIONS',
277-
'/FORCECLOSEAPPLICATIONS'
278-
)
279-
280-
mkdir $workingDir | Out-Null
281-
cd $workingDir
282-
gh release download --repo $repo --pattern $pattern
283-
$installer = Get-Item $pattern
284-
Start-Process -FilePath $installer -ArgumentList $arguments -NoNewWindow -Wait
285-
286-
Get-Content -Path $log -Tail 50
287-
- name: Report version/build of Git after upgrade
288-
if: matrix.os == 'windows-11-arm'
289-
run: git version --build-options
290253
- uses: actions/checkout@v4
291-
- name: Install rustup
292-
if: matrix.os == 'windows-11-arm'
293-
uses: ./.github/actions/setup-windows-arm-rustup
294254
- uses: dtolnay/rust-toolchain@stable
295255
- uses: Swatinem/rust-cache@v2
296256
- uses: taiki-e/install-action@v2

0 commit comments

Comments
 (0)