Skip to content

Commit 6419c76

Browse files
Merge branch 'main' into 1490
2 parents 605a780 + 91bfb00 commit 6419c76

File tree

239 files changed

+17588
-8050
lines changed

Some content is hidden

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

239 files changed

+17588
-8050
lines changed

.github/pull_request_template.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Summary
2+
3+
<!-- Describe the change in this PR -->
4+
5+
Fixes #XXXX
6+
7+
# Test Plan
8+
9+
<!-- Describe how you tested this PR -->
10+
11+
<!-- Run test.py and commit any changes to generated files -->

.github/workflows/build_extension.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,13 @@ jobs:
6767
# necessary for glibc 2.31
6868
container: ubuntu:20.04
6969
github_env: $GITHUB_ENV
70-
- os: macos-14
70+
# x86 EOL on github-actions is august 2027 according to https://github.com/actions/runner-images/issues/13046
71+
# we are currently cross-compiling but still running on macos-15-intel for the e2e tests. at EOL, we
72+
# likely need to disable the e2e test for this platform (e2e test tries starting binary on the machine).
73+
- os: macos-15-intel
7174
platform: darwin
7275
arch: x64
76+
rust_target: x86_64-apple-darwin
7377
github_env: $GITHUB_ENV
7478
- os: macos-14
7579
platform: darwin

0 commit comments

Comments
 (0)