From 9ae7467f954d06ebe0419e29a99ebfa48191a7fb Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Tue, 29 Oct 2024 08:44:00 +0100 Subject: [PATCH] Make pip-release workflow release cli as well --- .github/workflows/pip-release.yml | 54 ++++++++++++++++++++---------- binaries/cli/pyproject.toml | 6 ++++ node-hub/dora-rerun/pyproject.toml | 2 -- 3 files changed, 43 insertions(+), 19 deletions(-) create mode 100644 binaries/cli/pyproject.toml diff --git a/.github/workflows/pip-release.yml b/.github/workflows/pip-release.yml index 5c431add2..c7b3126fc 100644 --- a/.github/workflows/pip-release.yml +++ b/.github/workflows/pip-release.yml @@ -39,6 +39,9 @@ jobs: # target: s390x # - runner: ubuntu-20.04 # target: ppc64le + repository: + - path: apis/python/node + - path: binaries/cli steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -55,19 +58,19 @@ jobs: target: ${{ matrix.platform.target }} args: --release --out dist --zig manylinux: manylinux_2_28 - working-directory: apis/python/node + working-directory: ${{ matrix.repository.path }} - name: Upload wheels if: github.event_name == 'release' uses: actions/upload-artifact@v4 with: name: wheels-linux-${{ matrix.platform.target }} - path: apis/python/node/dist + path: ${{ matrix.repository.path }}/dist - name: Upload to release if: github.event_name == 'release' uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: apis/python/node/dist/* + file: ${{ matrix.repository.path }}/dist/* tag: ${{ github.ref }} file_glob: true @@ -82,6 +85,9 @@ jobs: target: x86 - runner: ubuntu-22.04 target: aarch64 + repository: + - path: apis/python/node + - path: binaries/cli steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -94,19 +100,19 @@ jobs: args: --release --out dist sccache: "true" manylinux: musllinux_1_2 - working-directory: apis/python/node + working-directory: ${{ matrix.repository.path }} - name: Upload wheels if: github.event_name == 'release' uses: actions/upload-artifact@v4 with: name: wheels-musllinux-${{ matrix.platform.target }} - path: apis/python/node/dist + path: ${{ matrix.repository.path }}/dist - name: Upload to release if: github.event_name == 'release' uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: apis/python/node/dist/* + file: ${{ matrix.repository.path }}/dist/* tag: ${{ github.ref }} file_glob: true @@ -121,6 +127,9 @@ jobs: image_tag: "armv7-musleabihf", }, ] + repository: + - path: apis/python/node + - path: binaries/cli container: image: docker://messense/rust-musl-cross:${{ matrix.platform.image_tag }} env: @@ -137,19 +146,19 @@ jobs: manylinux: auto container: off args: --release -o dist - working-directory: apis/python/node + working-directory: ${{ matrix.repository.path }} - name: Upload wheels if: github.event_name == 'release' uses: actions/upload-artifact@v3 with: name: wheels-musllinux-${{ matrix.platform.target }} - path: apis/python/node/dist + path: ${{ matrix.repository.path }}/dist - name: Upload to release if: github.event_name == 'release' uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: apis/python/node/dist/* + file: ${{ matrix.repository.path }}/dist/* tag: ${{ github.ref }} file_glob: true @@ -160,6 +169,9 @@ jobs: platform: - runner: windows-latest target: x64 + repository: + - path: apis/python/node + - path: binaries/cli steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -172,19 +184,19 @@ jobs: target: ${{ matrix.platform.target }} args: --release --out dist sccache: "true" - working-directory: apis/python/node + working-directory: ${{ matrix.repository.path }} - name: Upload wheels if: github.event_name == 'release' uses: actions/upload-artifact@v4 with: name: wheels-windows-${{ matrix.platform.target }} - path: apis/python/node/dist + path: ${{ matrix.repository.path }}/dist - name: Upload to release if: github.event_name == 'release' uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: apis/python/node/dist/* + file: ${{ matrix.repository.path }}/dist/* tag: ${{ github.ref }} file_glob: true @@ -197,6 +209,9 @@ jobs: target: x86_64 - runner: macos-14 target: aarch64 + repository: + - path: apis/python/node + - path: binaries/cli steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -208,24 +223,29 @@ jobs: target: ${{ matrix.platform.target }} args: --release --out dist sccache: "true" - working-directory: apis/python/node + working-directory: ${{ matrix.repository.path }} - name: Upload wheels if: github.event_name == 'release' uses: actions/upload-artifact@v4 with: name: wheels-macos-${{ matrix.platform.target }} - path: apis/python/node/dist + path: ${{ matrix.repository.path }}/dist - name: Upload to release if: github.event_name == 'release' uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: apis/python/node/dist/* + file: ${{ matrix.repository.path }}/dist/* tag: ${{ github.ref }} file_glob: true sdist: runs-on: ubuntu-22.04 + strategy: + matrix: + repository: + - path: apis/python/node + - path: binaries/cli steps: - uses: actions/checkout@v3 - name: Build sdist @@ -233,13 +253,13 @@ jobs: with: command: sdist args: --out dist - working-directory: apis/python/node + working-directory: ${{ matrix.repository.path }} - name: Upload sdist if: github.event_name == 'release' uses: actions/upload-artifact@v3 with: name: wheels - path: apis/python/node/dist + path: ${{ matrix.repository.path }}/dist release: name: Release diff --git a/binaries/cli/pyproject.toml b/binaries/cli/pyproject.toml new file mode 100644 index 000000000..6deee792f --- /dev/null +++ b/binaries/cli/pyproject.toml @@ -0,0 +1,6 @@ +[build-system] +requires = ["maturin>=0.13.2"] +build-backend = "maturin" + +[project] +name = "dora-rs-cli" diff --git a/node-hub/dora-rerun/pyproject.toml b/node-hub/dora-rerun/pyproject.toml index 79d053ee1..c0f314b2a 100644 --- a/node-hub/dora-rerun/pyproject.toml +++ b/node-hub/dora-rerun/pyproject.toml @@ -4,5 +4,3 @@ build-backend = "maturin" [project] name = "dora-rerun" -# Install pyarrow at the same time of dora-rs -dependencies = ['pyarrow']