diff --git a/.github/workflows/linux-cross.yaml b/.github/workflows/linux-cross.yaml index 39f15182..94e5569f 100644 --- a/.github/workflows/linux-cross.yaml +++ b/.github/workflows/linux-cross.yaml @@ -25,6 +25,7 @@ jobs: env: PYO3_CROSS_LIB_DIR: /opt/python/${{ matrix.python.abi }} with: + maturin-version: v0.12.19 target: ${{ matrix.target }} rust-toolchain: nightly-2022-06-22 manylinux: auto diff --git a/.github/workflows/manylinux2014.yaml b/.github/workflows/manylinux2014.yaml index 44619636..d70a9ca2 100644 --- a/.github/workflows/manylinux2014.yaml +++ b/.github/workflows/manylinux2014.yaml @@ -19,6 +19,9 @@ jobs: ] env: PATH: /github/home/.local/bin:/github/home/.cargo/bin:/opt/python/${{ matrix.python.abi }}/bin:/opt/rh/devtoolset-10/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin + CC: "gcc" + CFLAGS: "-O2 -fno-plt -flto" + LDFLAGS: "-O2 -flto -Wl,--as-needed" container: image: quay.io/pypa/manylinux2014_x86_64:latest options: --user 0 @@ -27,7 +30,7 @@ jobs: - uses: actions/checkout@v2 - run: python3 -m pip install --user --upgrade pip "maturin>=0.12.19,<0.13" wheel - run: cargo fetch - - run: maturin build --no-sdist --release --strip --cargo-extra-args="--features=unstable-simd" --compatibility manylinux2014 --interpreter python${{ matrix.python.version }} + - run: maturin build --no-sdist --release --strip --cargo-extra-args="--features=unstable-simd,yyjson" --compatibility manylinux2014 --interpreter python${{ matrix.python.version }} - run: python3 -m pip install --user target/wheels/orjson*.whl - run: python3 -m pip install --user -r test/requirements.txt -r integration/requirements.txt - run: pytest -s -rxX -v test diff --git a/.github/workflows/musllinux.yaml b/.github/workflows/musllinux.yaml index b7d0ba1a..0783a96f 100644 --- a/.github/workflows/musllinux.yaml +++ b/.github/workflows/musllinux.yaml @@ -30,10 +30,11 @@ jobs: - name: Build wheels uses: messense/maturin-action@v1 with: + maturin-version: v0.12.19 rust-toolchain: nightly-2022-06-22 target: ${{ matrix.platform.target }} manylinux: musllinux_1_1 - args: --release --strip --out dist --no-sdist --cargo-extra-args="--features=unstable-simd" -i python${{ matrix.python.version }} + args: --release --strip --out dist --no-sdist --cargo-extra-args="--features=unstable-simd,yyjson" -i python${{ matrix.python.version }} - name: Set up QEMU if: matrix.platform.arch != 'x86_64' uses: docker/setup-qemu-action@v2 diff --git a/ci/azure-macos.yml b/ci/azure-macos.yml index cbf1e324..79d58513 100644 --- a/ci/azure-macos.yml +++ b/ci/azure-macos.yml @@ -36,7 +36,7 @@ steps: env: CC: "clang" CFLAGS: "-O2 -fno-plt -flto=thin" - LDFLAGS: "-O2 -flto=thin -fuse-ld=lld --as-needed,-z,relro,-z,now" + LDFLAGS: "-O2 -flto=thin -fuse-ld=lld -Wl,--as-needed" displayName: build universal2 - bash: pip install --force-reinstall target/wheels/orjson*universal2.whl displayName: install universal2