Skip to content

Commit 765fc2a

Browse files
committed
Address feddback
1 parent d3da915 commit 765fc2a

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.github/workflows/jit.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ concurrency:
3232
cancel-in-progress: true
3333

3434
env:
35-
LLVM: 19
35+
llvm: 19
3636

3737
jobs:
3838
interpreter:
@@ -73,19 +73,19 @@ jobs:
7373
- name: Native Windows
7474
if: matrix.arch != 'ARM64'
7575
run: |
76-
choco install llvm --allow-downgrade --no-progress --version ${{ env.LLVM }}.1.0
76+
choco install llvm --allow-downgrade --no-progress --version ${{ env.llvm }}.1.0
7777
./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.arch }}
7878
./PCbuild/rt.bat ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.arch }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
7979
8080
# No tests (yet):
8181
- name: Emulated Windows
8282
if: matrix.arch == 'ARM64'
8383
run: |
84-
choco install llvm --allow-downgrade --no-progress --version ${{ env.LLVM }}.1.0
84+
choco install llvm --allow-downgrade --no-progress --version ${{ env.llvm }}.1.0
8585
./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.arch }}
8686
8787
jit-mac:
88-
name: macOS (${{ matrix.os }}, ${{ matrix.debug && 'Debug' || 'Release' }})
88+
name: macOS (${{ matrix.os == 'macos-14' && 'aarch64' || 'x86_64' }}, ${{ matrix.debug && 'Debug' || 'Release' }})
8989
needs: interpreter
9090
runs-on: ${{ matrix.os }}
9191
timeout-minutes: 90
@@ -112,14 +112,14 @@ jobs:
112112
run: |
113113
brew update
114114
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
115-
brew install llvm@${{ env.LLVM }}
115+
brew install llvm@${{ env.llvm }}
116116
export SDKROOT="$(xcrun --show-sdk-path)"
117117
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '' }}
118118
make all --jobs 4
119119
./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3
120120
121121
jit-ubuntu:
122-
name: Ubuntu (${{ matrix.os }}, ${{ matrix.debug && 'Debug' || 'Release' }})
122+
name: Ubuntu (${{ matrix.os == 'ubuntu-24.04-aarch64' && 'aarch64' || 'x86_64' }}, ${{ matrix.debug && 'Debug' || 'Release' }})
123123
needs: interpreter
124124
runs-on: ${{ matrix.os }}
125125
timeout-minutes: 90
@@ -145,7 +145,7 @@ jobs:
145145

146146
- name: ${{ runner.os }} (${{ runner.arch }})
147147
run: |
148-
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ env.LLVM }}
148+
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ env.llvm }}
149149
export PATH="$(llvm-config-${{ env.llvm }} --bindir):$PATH"
150150
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '' }}
151151
make all --jobs 4
@@ -162,7 +162,7 @@ jobs:
162162
python-version: '3.11'
163163
- name: Build with JIT enabled and GIL disabled
164164
run: |
165-
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ env.LLVM }}
165+
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ env.llvm }}
166166
export PATH="$(llvm-config-${{ env.llvm }} --bindir):$PATH"
167167
./configure --enable-experimental-jit --with-pydebug --disable-gil
168168
make all --jobs 4

0 commit comments

Comments
 (0)