From 5fee36e587cfb26c9865db8f06a2c19690babb05 Mon Sep 17 00:00:00 2001 From: Tpt Date: Sat, 19 Aug 2023 11:09:56 +0200 Subject: [PATCH] Improves naming of artifacts built by the CI --- .github/workflows/artifacts.yml | 25 ++++++++++++++++--------- .github/workflows/manylinux_build.sh | 8 ++++---- .github/workflows/musllinux_build.sh | 8 ++++---- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml index a72c065d..bf91b537 100644 --- a/.github/workflows/artifacts.yml +++ b/.github/workflows/artifacts.yml @@ -37,7 +37,7 @@ jobs: path: target/release/oxigraph_server - uses: actions/upload-artifact@v3 with: - name: oxigraph_server_aarch64-linux_gnu + name: oxigraph_server_aarch64_linux_gnu path: target/aarch64-unknown-linux-gnu/release/oxigraph_server - run: mv target/release/oxigraph_server oxigraph_server_${{ github.event.release.tag_name }}_x86_64_linux_gnu if: github.event_name == 'release' @@ -126,7 +126,7 @@ jobs: if: github.event_name == 'release' || matrix.architecture == 'x86_64' - uses: actions/upload-artifact@v3 with: - name: pyoxigraph_wheel_x86_64_linux + name: pyoxigraph_wheel_x86_64_linux_gnu path: target/wheels/*.whl - uses: pypa/gh-action-pypi-publish@release/v1 with: @@ -181,15 +181,19 @@ jobs: cache: pip cache-dependency-path: '**/requirements.dev.txt' - run: pip install -r python/requirements.dev.txt - - run: maturin build --release -m python/Cargo.toml --features abi3 + - run: maturin build --release --features abi3 + working-directory: ./python - run: pip install --no-index --find-links=target/wheels/ pyoxigraph - run: rm -r target/wheels - run: python generate_stubs.py pyoxigraph pyoxigraph.pyi --black working-directory: ./python - - run: maturin build --release --target universal2-apple-darwin -m python/Cargo.toml --features abi3 - - run: maturin build --release -m python/Cargo.toml --features abi3 + - run: maturin build --release --target universal2-apple-darwin --features abi3 + working-directory: ./python + - run: maturin build --release --features abi3 + working-directory: ./python if: github.event_name == 'release' - - run: maturin build --release --target aarch64-apple-darwin -m python/Cargo.toml --features abi3 + - run: maturin build --release --target aarch64-apple-darwin --features abi3 + working-directory: ./python if: github.event_name == 'release' - uses: actions/upload-artifact@v3 with: @@ -216,13 +220,16 @@ jobs: cache-dependency-path: '**/requirements.dev.txt' - run: Remove-Item -LiteralPath "C:\msys64\" -Force -Recurse - run: pip install -r python/requirements.dev.txt - - run: maturin build --release -m python/Cargo.toml --features abi3 + - run: maturin build --release --features abi3 + working-directory: ./python - run: pip install --no-index --find-links=target/wheels/ pyoxigraph - run: rm -r target/wheels - run: python generate_stubs.py pyoxigraph pyoxigraph.pyi --black working-directory: ./python - - run: maturin build --release -m python/Cargo.toml --features abi3 - - run: maturin sdist -m python/Cargo.toml + - run: maturin build --release --features abi3 + working-directory: ./python + - run: maturin sdist + working-directory: ./python - uses: actions/upload-artifact@v3 with: name: pyoxigraph_wheel_x86_64_windows diff --git a/.github/workflows/manylinux_build.sh b/.github/workflows/manylinux_build.sh index 1ed3f3e2..ae72000d 100644 --- a/.github/workflows/manylinux_build.sh +++ b/.github/workflows/manylinux_build.sh @@ -8,14 +8,14 @@ chmod +x rustup-init source "$HOME/.cargo/env" export PATH="${PATH}:/opt/python/cp37-cp37m/bin:/opt/python/cp38-cp38/bin:/opt/python/cp39-cp39/bin:/opt/python/cp310-cp310/bin:/opt/python/cp311-cp311/bin" cd python -python3.10 -m venv venv +python3.11 -m venv venv source venv/bin/activate pip install -r requirements.dev.txt -maturin develop --release -m Cargo.toml +maturin develop --release python generate_stubs.py pyoxigraph pyoxigraph.pyi --black -maturin build --release -m Cargo.toml --features abi3 --compatibility manylinux2014 +maturin build --release --features abi3 --compatibility manylinux2014 if [ %for_each_version% ]; then for VERSION in 7 8 9 10 11; do - maturin build --release -m Cargo.toml --interpreter "python3.$VERSION" --compatibility manylinux2014 + maturin build --release --interpreter "python3.$VERSION" --compatibility manylinux2014 done fi diff --git a/.github/workflows/musllinux_build.sh b/.github/workflows/musllinux_build.sh index 7dd2fb4c..8abc5b0d 100644 --- a/.github/workflows/musllinux_build.sh +++ b/.github/workflows/musllinux_build.sh @@ -6,14 +6,14 @@ chmod +x rustup-init source "$HOME/.cargo/env" export PATH="${PATH}:/opt/python/cp37-cp37m/bin:/opt/python/cp38-cp38/bin:/opt/python/cp39-cp39/bin:/opt/python/cp310-cp310/bin:/opt/python/cp311-cp311/bin" cd python -python3.10 -m venv venv +python3.11 -m venv venv source venv/bin/activate pip install -r requirements.dev.txt -maturin develop --release -m Cargo.toml +maturin develop --release python generate_stubs.py pyoxigraph pyoxigraph.pyi --black -maturin build --release -m Cargo.toml --features abi3 --compatibility musllinux_1_1 +maturin build --release --features abi3 --compatibility musllinux_1_1 if [ %for_each_version% ]; then for VERSION in 7 8 9 10 11; do - maturin build --release -m Cargo.toml --interpreter "python3.$VERSION" --compatibility musllinux_1_1 + maturin build --release --interpreter "python3.$VERSION" --compatibility musllinux_1_1 done fi