Skip to content

Commit d7359c9

Browse files
committed
Remove macOS 13 CI runner
1 parent 1d3aa7a commit d7359c9

File tree

2 files changed

+3
-85
lines changed

2 files changed

+3
-85
lines changed

.github/workflows/artifact.yaml

Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -543,86 +543,6 @@ jobs:
543543
{ version: '3.12', macosx_target: "10.15", publish: true },
544544
{ version: '3.11', macosx_target: "10.15", publish: true },
545545
{ version: '3.10', macosx_target: "10.15", publish: true },
546-
]
547-
env:
548-
CC: "clang"
549-
CFLAGS: "-O2 -fstrict-aliasing"
550-
LDFLAGS: "-Wl,--as-needed"
551-
CFLAGS_x86_64_apple_darwin: "-O2 -fstrict-aliasing -fno-plt -march=x86-64-v2 -mtune=generic"
552-
CFLAGS_aarch64_apple_darwin: "-O2 -fstrict-aliasing -fno-plt -mcpu=apple-m1 -mtune=generic"
553-
RUSTFLAGS: "-C lto=fat -Z mir-opt-level=4 -Z threads=3 -D warnings"
554-
PATH: "/Users/runner/work/orjson/orjson/.venv/bin:/Users/runner/.cargo/bin:/usr/local/opt/curl/bin:/usr/local/bin:/usr/local/sbin:/Users/runner/bin:/Library/Frameworks/Python.framework/Versions/Current/bin:/usr/bin:/bin:/usr/sbin:/sbin"
555-
steps:
556-
557-
- name: CPU info
558-
run: sysctl -a | grep brand
559-
560-
- uses: actions/checkout@v4
561-
562-
- uses: actions/setup-python@v5
563-
with:
564-
allow-prereleases: true
565-
python-version: "${{ matrix.python.version }}"
566-
567-
- uses: dtolnay/rust-toolchain@master
568-
with:
569-
toolchain: "${{ env.RUST_TOOLCHAIN }}"
570-
targets: "aarch64-apple-darwin, x86_64-apple-darwin"
571-
components: "rust-src"
572-
573-
- name: Build environment
574-
run: |
575-
cargo fetch --target aarch64-apple-darwin &
576-
577-
export PATH=$HOME/.cargo/bin:$HOME/.local/bin:$PATH
578-
579-
curl -LsSf https://astral.sh/uv/install.sh | sh
580-
uv venv --python python${{ matrix.python.version }}
581-
uv pip install --upgrade "maturin>=1,<2" -r test/requirements.txt -r integration/requirements.txt
582-
583-
mkdir .cargo
584-
cp ci/config.toml .cargo/config.toml
585-
586-
- name: maturin
587-
run: |
588-
export PATH=$HOME/.cargo/bin:$HOME/.local/bin:$PATH
589-
590-
MACOSX_DEPLOYMENT_TARGET="${{ matrix.python.macosx_target }}" \
591-
PYO3_CROSS_LIB_DIR=$(python -c "import sysconfig;print(sysconfig.get_config_var('LIBDIR'))") \
592-
maturin build \
593-
--release \
594-
--strip \
595-
--features=generic_simd,yyjson \
596-
--interpreter python${{ matrix.python.version }} \
597-
--target=universal2-apple-darwin
598-
uv pip install target/wheels/orjson*.whl
599-
600-
- run: pytest -v test
601-
env:
602-
PYTHONMALLOC: "debug"
603-
604-
- run: source .venv/bin/activate && ./integration/run thread
605-
- run: source .venv/bin/activate && ./integration/run http
606-
- run: source .venv/bin/activate && ./integration/run init
607-
608-
- name: Store wheels
609-
if: matrix.python.publish == true
610-
uses: actions/upload-artifact@v4
611-
with:
612-
name: orjson_universal2_aarch64_${{ matrix.python.version }}
613-
path: target/wheels
614-
overwrite: true
615-
retention-days: 1
616-
if-no-files-found: "error"
617-
compression-level: 0
618-
619-
macos_universal2_amd64:
620-
runs-on: macos-13
621-
timeout-minutes: 10
622-
strategy:
623-
fail-fast: false
624-
matrix:
625-
python: [
626546
{ version: '3.9', macosx_target: "10.15", publish: true },
627547
]
628548
env:
@@ -690,7 +610,7 @@ jobs:
690610
if: matrix.python.publish == true
691611
uses: actions/upload-artifact@v4
692612
with:
693-
name: orjson_universal2_amd64_${{ matrix.python.version }}
613+
name: orjson_universal2_aarch64_${{ matrix.python.version }}
694614
path: target/wheels
695615
overwrite: true
696616
retention-days: 1
@@ -846,7 +766,6 @@ jobs:
846766
needs: [
847767
macos_aarch64,
848768
macos_universal2_aarch64,
849-
macos_universal2_amd64,
850769
manylinux_aarch64,
851770
manylinux_amd64,
852771
manylinux_cross,

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,9 +1090,8 @@ nightly.
10901090

10911091
orjson is tested on native hardware for amd64, aarch64, and i686 on Linux and
10921092
for arm7, ppc64le, and s390x is cross-compiled and may be tested via
1093-
emulation. It is tested for either aarch64 or amd64 on macOS and
1094-
cross-compiles for the other, depending on version. For Windows it is
1095-
tested on amd64 and i686.
1093+
emulation. It is tested for aarch64 on macOS and cross-compiles for amd64. For
1094+
Windows it is tested on amd64, i686, and aarch64.
10961095

10971096
There are no runtime dependencies other than libc.
10981097

0 commit comments

Comments
 (0)