Skip to content

Commit 8b50ee8

Browse files
marceltaeumelmarceltaeumel
committed
Windows CI | I give up. No custom Clang for now in CI.
1 parent 45710c3 commit 8b50ee8

File tree

2 files changed

+16
-32
lines changed

2 files changed

+16
-32
lines changed

‎.github/workflows/win-arm.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
fail-fast: false
4848
matrix:
4949
arch:
50-
- { name: win64ARMv8, clang: 21.1.0 }
50+
- win64ARMv8
5151
flavor:
5252
- squeak.cog.spur
5353
- squeak.stack.spur
@@ -58,9 +58,9 @@ jobs:
5858
- assert
5959

6060
runs-on: windows-11-arm
61-
name: ${{ matrix.flavor }} for ${{ matrix.arch.name }}${{ matrix.mode == 'debug' && ' (DEBUG)' || matrix.mode == 'assert' && ' (ASSERT)' || '' }}
61+
name: ${{ matrix.flavor }} for ${{ matrix.arch }}${{ matrix.mode == 'debug' && ' (DEBUG)' || matrix.mode == 'assert' && ' (ASSERT)' || '' }}
6262
env:
63-
ARCH: ${{ matrix.arch.name }}
63+
ARCH: ${{ matrix.arch }}
6464
FLAVOR: ${{ matrix.flavor }}
6565
MODE: ${{ matrix.mode }}
6666
steps:
@@ -80,13 +80,8 @@ jobs:
8080
path: .thirdparty-cache
8181
key: thirdparty-cache-${{ matrix.arch.name }}-${{ matrix.flavor }}
8282

83-
- name: Install LLVM/Clang (${{ matrix.arch.clang }})
84-
if: ${{ !startsWith(matrix.arch.clang, 'msvc') }}
85-
shell: pwsh
86-
run: |
87-
Start-BitsTransfer -Source "https://github.com/llvm/llvm-project/releases/download/llvmorg-${{ matrix.arch.clang }}/LLVM-${{ matrix.arch.clang }}-woa64.exe" -Destination "LLVM-${{ matrix.arch.clang }}-woa64.exe"
88-
Start-Process -FilePath "LLVM-${{ matrix.arch.clang }}-woa64.exe" -ArgumentList "/S" -Wait
89-
echo "LLVM_BIN=C:/Program Files/LLVM/bin/" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
83+
# - name: Setup tmate debugging session
84+
# uses: mxschmitt/action-tmate@v3
9085

9186
- name: Prepare MSYS2 environment
9287
uses: msys2/setup-msys2@v2
@@ -98,9 +93,6 @@ jobs:
9893
cache: true
9994
install: git base make
10095

101-
- name: Setup tmate debugging session
102-
uses: mxschmitt/action-tmate@v3
103-
10496
- name: Build VM
10597
shell: msys2 {0} #bash
10698
run: ./scripts/ci/actions_build.sh

‎.github/workflows/win.yml

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,21 @@ jobs:
4747
fail-fast: false
4848
matrix:
4949
arch:
50-
- { name: win64x64, clang: 21.1.0, clang-arch: win64 }
51-
# - { name: win32x86, clang: msvc, clang-arch: win32 }
50+
- win64x64
51+
- win32x86
5252
flavor:
5353
- squeak.cog.spur
54-
# - squeak.stack.spur
55-
# - squeak.sista.spur
54+
- squeak.stack.spur
55+
- squeak.sista.spur
5656
mode:
5757
- fast
58-
# - debug
59-
# - assert
58+
- debug
59+
- assert
6060

6161
runs-on: windows-2025
62-
name: ${{ matrix.flavor }} for ${{ matrix.arch.name }}${{ matrix.mode == 'debug' && ' (DEBUG)' || matrix.mode == 'assert' && ' (ASSERT)' || '' }}
62+
name: ${{ matrix.flavor }} for ${{ matrix.arch }}${{ matrix.mode == 'debug' && ' (DEBUG)' || matrix.mode == 'assert' && ' (ASSERT)' || '' }}
6363
env:
64-
ARCH: ${{ matrix.arch.name }}
64+
ARCH: ${{ matrix.arch }}
6565
FLAVOR: ${{ matrix.flavor }}
6666
MODE: ${{ matrix.mode }}
6767
steps:
@@ -79,19 +79,11 @@ jobs:
7979
uses: actions/cache@v4
8080
with:
8181
path: .thirdparty-cache
82-
key: thirdparty-cache-${{ matrix.arch.name }}-${{ matrix.flavor }}
83-
84-
- name: Install LLVM/Clang (${{ matrix.arch.clang }})
85-
if: ${{ !startsWith(matrix.arch.clang, 'msvc') }}
86-
shell: pwsh
87-
run: |
88-
Start-BitsTransfer -Source "https://github.com/llvm/llvm-project/releases/download/llvmorg-${{ matrix.arch.clang }}/LLVM-${{ matrix.arch.clang }}-${{ matrix.arch.clang-arch }}.exe" -Destination "LLVM-${{ matrix.arch.clang }}-${{ matrix.arch.clang-arch }}.exe"
89-
Start-Process -FilePath "LLVM-${{ matrix.arch.clang }}-${{ matrix.arch.clang-arch }}.exe" -ArgumentList "/S /D=C:\LLVM-${{ matrix.arch.clang }}" -Wait
90-
echo "LLVM_BIN=C:/LLVM-${{ matrix.arch.clang }}/bin/" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
82+
key: thirdparty-cache-${{ matrix.arch }}-${{ matrix.flavor }}
9183

9284
# Set your personal SSH key via GitHub to login securely into tmate shell
93-
- name: Setup tmate debugging session
94-
uses: mxschmitt/action-tmate@v3
85+
# - name: Setup tmate debugging session
86+
# uses: mxschmitt/action-tmate@v3
9587

9688
- name: Prepare MSYS2 environment
9789
uses: msys2/setup-msys2@v2

0 commit comments

Comments
 (0)