Skip to content

Commit 066f3ec

Browse files
authored
Merge branch 'main' into test_code_crash
2 parents 60e0a08 + 17636ba commit 066f3ec

File tree

183 files changed

+7088
-4227
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+7088
-4227
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ jobs:
205205
free-threading: true
206206
uses: ./.github/workflows/reusable-macos.yml
207207
with:
208-
config_hash: ${{ needs.build-context.outputs.config-hash }}
209208
free-threading: ${{ matrix.free-threading }}
210209
os: ${{ matrix.os }}
211210

@@ -237,7 +236,6 @@ jobs:
237236
bolt: true
238237
uses: ./.github/workflows/reusable-ubuntu.yml
239238
with:
240-
config_hash: ${{ needs.build-context.outputs.config-hash }}
241239
bolt-optimizations: ${{ matrix.bolt }}
242240
free-threading: ${{ matrix.free-threading }}
243241
os: ${{ matrix.os }}
@@ -414,8 +412,6 @@ jobs:
414412
needs: build-context
415413
if: needs.build-context.outputs.run-tests == 'true'
416414
uses: ./.github/workflows/reusable-wasi.yml
417-
with:
418-
config_hash: ${{ needs.build-context.outputs.config-hash }}
419415

420416
test-hypothesis:
421417
name: "Hypothesis tests on Ubuntu"
@@ -600,7 +596,6 @@ jobs:
600596
uses: ./.github/workflows/reusable-san.yml
601597
with:
602598
sanitizer: ${{ matrix.sanitizer }}
603-
config_hash: ${{ needs.build-context.outputs.config-hash }}
604599
free-threading: ${{ matrix.free-threading }}
605600

606601
cross-build-linux:

.github/workflows/jit.yml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,9 @@ jobs:
5757
fail-fast: false
5858
matrix:
5959
target:
60-
# To re-enable later when we support these.
61-
# - i686-pc-windows-msvc/msvc
62-
# - x86_64-pc-windows-msvc/msvc
63-
# - aarch64-pc-windows-msvc/msvc
60+
- i686-pc-windows-msvc/msvc
61+
- x86_64-pc-windows-msvc/msvc
62+
- aarch64-pc-windows-msvc/msvc
6463
- x86_64-apple-darwin/clang
6564
- aarch64-apple-darwin/clang
6665
- x86_64-unknown-linux-gnu/gcc
@@ -71,16 +70,15 @@ jobs:
7170
llvm:
7271
- 21
7372
include:
74-
# To re-enable later when we support these.
75-
# - target: i686-pc-windows-msvc/msvc
76-
# architecture: Win32
77-
# runner: windows-2022
78-
# - target: x86_64-pc-windows-msvc/msvc
79-
# architecture: x64
80-
# runner: windows-2022
81-
# - target: aarch64-pc-windows-msvc/msvc
82-
# architecture: ARM64
83-
# runner: windows-11-arm
73+
- target: i686-pc-windows-msvc/msvc
74+
architecture: Win32
75+
runner: windows-2022
76+
- target: x86_64-pc-windows-msvc/msvc
77+
architecture: x64
78+
runner: windows-2022
79+
- target: aarch64-pc-windows-msvc/msvc
80+
architecture: ARM64
81+
runner: windows-11-arm
8482
- target: x86_64-apple-darwin/clang
8583
architecture: x86_64
8684
runner: macos-15-intel

.github/workflows/reusable-context.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ on: # yamllint disable-line rule:truthy
1717
# || 'falsy-branch'
1818
# }}
1919
#
20-
config-hash:
21-
description: Config hash value for use in cache keys
22-
value: ${{ jobs.compute-changes.outputs.config-hash }} # str
2320
run-docs:
2421
description: Whether to build the docs
2522
value: ${{ jobs.compute-changes.outputs.run-docs }} # bool
@@ -42,7 +39,6 @@ jobs:
4239
runs-on: ubuntu-latest
4340
timeout-minutes: 10
4441
outputs:
45-
config-hash: ${{ steps.config-hash.outputs.hash }}
4642
run-ci-fuzz: ${{ steps.changes.outputs.run-ci-fuzz }}
4743
run-docs: ${{ steps.changes.outputs.run-docs }}
4844
run-tests: ${{ steps.changes.outputs.run-tests }}
@@ -100,8 +96,3 @@ jobs:
10096
GITHUB_EVENT_NAME: ${{ github.event_name }}
10197
CCF_TARGET_REF: ${{ github.base_ref || github.event.repository.default_branch }}
10298
CCF_HEAD_REF: ${{ github.event.pull_request.head.sha || github.sha }}
103-
104-
- name: Compute hash for config cache key
105-
id: config-hash
106-
run: |
107-
echo "hash=${{ hashFiles('configure', 'configure.ac', '.github/workflows/build.yml') }}" >> "$GITHUB_OUTPUT"

.github/workflows/reusable-macos.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ name: Reusable macOS
33
on:
44
workflow_call:
55
inputs:
6-
config_hash:
7-
required: true
8-
type: string
96
free-threading:
107
required: false
118
type: boolean

.github/workflows/reusable-san.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ on:
66
sanitizer:
77
required: true
88
type: string
9-
config_hash:
10-
required: true
11-
type: string
129
free-threading:
1310
description: Whether to use free-threaded mode
1411
required: false

.github/workflows/reusable-ubuntu.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ name: Reusable Ubuntu
33
on:
44
workflow_call:
55
inputs:
6-
config_hash:
7-
required: true
8-
type: string
96
bolt-optimizations:
107
description: Whether to enable BOLT optimizations
118
required: false

.github/workflows/reusable-wasi.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ name: Reusable WASI
22

33
on:
44
workflow_call:
5-
inputs:
6-
config_hash:
7-
required: true
8-
type: string
95

106
env:
117
FORCE_COLOR: 1
@@ -53,7 +49,7 @@ jobs:
5349
- name: "Configure build Python"
5450
run: python3 Tools/wasm/wasi configure-build-python -- --config-cache --with-pydebug
5551
- name: "Make build Python"
56-
run: python3 Tools/wasm/wasi.py make-build-python
52+
run: python3 Tools/wasm/wasi make-build-python
5753
- name: "Configure host"
5854
# `--with-pydebug` inferred from configure-build-python
5955
run: python3 Tools/wasm/wasi configure-host -- --config-cache

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ Tools/unicode/data/
135135
/config.log
136136
/config.status
137137
/config.status.lineno
138-
# hendrikmuhs/ccache-action@v1
139138
/.ccache
140139
/cross-build/
141140
/jit_stencils*.h

.pre-commit-config.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
33
rev: v0.13.2
44
hooks:
5+
- id: ruff-check
6+
name: Run Ruff (lint) on Apple/
7+
args: [--exit-non-zero-on-fix, --config=Apple/.ruff.toml]
8+
files: ^Apple/
59
- id: ruff-check
610
name: Run Ruff (lint) on Doc/
711
args: [--exit-non-zero-on-fix]
@@ -30,6 +34,10 @@ repos:
3034
name: Run Ruff (lint) on Tools/wasm/
3135
args: [--exit-non-zero-on-fix, --config=Tools/wasm/.ruff.toml]
3236
files: ^Tools/wasm/
37+
- id: ruff-format
38+
name: Run Ruff (format) on Apple/
39+
args: [--exit-non-zero-on-fix, --config=Apple/.ruff.toml]
40+
files: ^Apple
3341
- id: ruff-format
3442
name: Run Ruff (format) on Doc/
3543
args: [--check]

Apple/.ruff.toml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
extend = "../.ruff.toml" # Inherit the project-wide settings
2+
3+
[format]
4+
preview = true
5+
docstring-code-format = true
6+
7+
[lint]
8+
select = [
9+
"C4", # flake8-comprehensions
10+
"E", # pycodestyle
11+
"F", # pyflakes
12+
"I", # isort
13+
"ISC", # flake8-implicit-str-concat
14+
"LOG", # flake8-logging
15+
"PGH", # pygrep-hooks
16+
"PT", # flake8-pytest-style
17+
"PYI", # flake8-pyi
18+
"RUF100", # Ban unused `# noqa` comments
19+
"UP", # pyupgrade
20+
"W", # pycodestyle
21+
"YTT", # flake8-2020
22+
]

0 commit comments

Comments
 (0)