Skip to content

Commit 2c68dee

Browse files
JacobCoffeeJacobCoffee
committed
bring things back online
1 parent 499ce70 commit 2c68dee

File tree

12 files changed

+55
-61
lines changed

12 files changed

+55
-61
lines changed

‎.github/workflows/add-issue-header.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: Add issue header
22
# Automatically edits an issue's descriptions with a header,
33
# one of:
44

5-
# Temporarily disabled for JIT-focused development
6-
if: false
75

86
#
97
# - Bug report

‎.github/workflows/build.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ on:
1111
- 'main'
1212
- '3.*'
1313

14-
# Temporarily disabled for JIT-focused development
15-
# Remove this if block to re-enable
16-
if: false
1714

1815
permissions:
1916
contents: read

‎.github/workflows/documentation-links.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: Read the Docs PR preview
22
# Automatically edits a pull request's descriptions with a link
33
# to the documentation's preview on Read the Docs.
44

5-
# Temporarily disabled for JIT-focused development
6-
if: false
75
on:
86
pull_request_target:
97
types:

‎.github/workflows/jit.yml‎

Lines changed: 55 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,25 @@
11
name: JIT
22
on:
33
pull_request:
4+
paths:
5+
- '**jit**'
6+
- 'Python/bytecodes.c'
7+
- 'Python/optimizer*.c'
8+
- 'Python/executor_cases.c.h'
9+
- 'Python/optimizer_cases.c.h'
10+
- '!Python/perf_jit_trampoline.c'
11+
- '!**/*.md'
12+
- '!**/*.ini'
413
push:
14+
paths:
15+
- '**jit**'
16+
- 'Python/bytecodes.c'
17+
- 'Python/optimizer*.c'
18+
- 'Python/executor_cases.c.h'
19+
- 'Python/optimizer_cases.c.h'
20+
- '!Python/perf_jit_trampoline.c'
21+
- '!**/*.md'
22+
- '!**/*.ini'
523
workflow_dispatch:
624

725
permissions:
@@ -39,40 +57,40 @@ jobs:
3957
fail-fast: false
4058
matrix:
4159
target:
42-
# - i686-pc-windows-msvc/msvc
43-
# - x86_64-pc-windows-msvc/msvc
44-
# - aarch64-pc-windows-msvc/msvc
60+
- i686-pc-windows-msvc/msvc
61+
- x86_64-pc-windows-msvc/msvc
62+
- aarch64-pc-windows-msvc/msvc
4563
- x86_64-apple-darwin/clang
46-
# - aarch64-apple-darwin/clang
47-
# - x86_64-unknown-linux-gnu/gcc
48-
# - aarch64-unknown-linux-gnu/gcc
64+
- aarch64-apple-darwin/clang
65+
- x86_64-unknown-linux-gnu/gcc
66+
- aarch64-unknown-linux-gnu/gcc
4967
debug:
5068
- true
5169
- false
5270
llvm:
5371
- 19
5472
include:
55-
# - target: i686-pc-windows-msvc/msvc
56-
# architecture: Win32
57-
# runner: windows-2022
58-
# - target: x86_64-pc-windows-msvc/msvc
59-
# architecture: x64
60-
# runner: windows-2022
61-
# - target: aarch64-pc-windows-msvc/msvc
62-
# architecture: ARM64
63-
# runner: windows-11-arm
73+
- target: i686-pc-windows-msvc/msvc
74+
architecture: Win32
75+
runner: windows-latest
76+
- target: x86_64-pc-windows-msvc/msvc
77+
architecture: x64
78+
runner: windows-latest
79+
- target: aarch64-pc-windows-msvc/msvc
80+
architecture: ARM64
81+
runner: windows-11-arm
6482
- target: x86_64-apple-darwin/clang
6583
architecture: x86_64
84+
runner: macos-13
85+
- target: aarch64-apple-darwin/clang
86+
architecture: aarch64
6687
runner: macos-14
67-
# - target: aarch64-apple-darwin/clang
68-
# architecture: aarch64
69-
# runner: macos-14
70-
# - target: x86_64-unknown-linux-gnu/gcc
71-
# architecture: x86_64
72-
# runner: ubuntu-24.04
73-
# - target: aarch64-unknown-linux-gnu/gcc
74-
# architecture: aarch64
75-
# runner: ubuntu-24.04-arm
88+
- target: x86_64-unknown-linux-gnu/gcc
89+
architecture: x86_64
90+
runner: ubuntu-24.04
91+
- target: aarch64-unknown-linux-gnu/gcc
92+
architecture: aarch64
93+
runner: ubuntu-24.04-arm
7694
steps:
7795
- uses: actions/checkout@v4
7896
with:
@@ -82,12 +100,11 @@ jobs:
82100
python-version: '3.11'
83101

84102
# PCbuild downloads LLVM automatically:
85-
# - name: Windows
86-
# if: runner.os == 'Windows'
87-
# run: |
88-
# ./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }}
89-
# ./PCbuild/rt.bat ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }} \
90-
# -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
103+
- name: Windows
104+
if: runner.os == 'Windows'
105+
run: |
106+
./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }}
107+
./PCbuild/rt.bat ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
91108
92109
- name: macOS
93110
# The `find` line is required as a result of https://github.com/actions/runner-images/issues/9966.
@@ -109,14 +126,14 @@ jobs:
109126
arch -x86_64 make all --jobs 4
110127
./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3
111128
112-
# - name: Linux
113-
# if: runner.os == 'Linux'
114-
# run: |
115-
# sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ matrix.llvm }}
116-
# export PATH="$(llvm-config-${{ matrix.llvm }} --bindir):$PATH"
117-
# ./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '' }}
118-
# make all --jobs 4
119-
# ./python -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3
129+
- name: Linux
130+
if: runner.os == 'Linux'
131+
run: |
132+
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ matrix.llvm }}
133+
export PATH="$(llvm-config-${{ matrix.llvm }} --bindir):$PATH"
134+
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '' }}
135+
make all --jobs 4
136+
./python -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3
120137
121138
no-opt-jit:
122139
name: JIT without optimizations (Debug)

‎.github/workflows/lint.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: Lint
22

33
on: [push, pull_request, workflow_dispatch]
44

5-
# Temporarily disabled for JIT-focused development
6-
if: false
75

86
permissions:
97
contents: read

‎.github/workflows/mypy.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ on:
77
- main
88
pull_request:
99

10-
# Temporarily disabled for JIT-focused development
11-
if: false
1210
paths:
1311
- ".github/workflows/mypy.yml"
1412
- "Lib/_colorize.py"

‎.github/workflows/new-bugs-announce-notifier.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: new-bugs-announce notifier
22

33
on:
44

5-
# Temporarily disabled for JIT-focused development
6-
if: false
75
issues:
86
types:
97
- opened

‎.github/workflows/project-updater.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: Update GH projects
22

33
on:
44

5-
# Temporarily disabled for JIT-focused development
6-
if: false
75
issues:
86
types:
97
- opened

‎.github/workflows/require-pr-label.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: Check labels
22

33
on:
44

5-
# Temporarily disabled for JIT-focused development
6-
if: false
75
pull_request:
86
types: [opened, reopened, labeled, unlabeled, synchronize]
97

‎.github/workflows/stale.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: Mark stale pull requests
22

33
on:
44

5-
# Temporarily disabled for JIT-focused development
6-
if: false
75
schedule:
86
- cron: "0 */6 * * *"
97

0 commit comments

Comments
 (0)