From 861ba42721dfa8885ba3ae8dce9ff5407812ccd9 Mon Sep 17 00:00:00 2001 From: concur1 Date: Fri, 1 Nov 2024 09:12:54 +0000 Subject: [PATCH 1/6] Set maturin rust toolchain. --- .github/workflows/python-ci.yaml | 39 +++++++++++++++++--------------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/.github/workflows/python-ci.yaml b/.github/workflows/python-ci.yaml index 01c3e67a..7e15036f 100644 --- a/.github/workflows/python-ci.yaml +++ b/.github/workflows/python-ci.yaml @@ -6,9 +6,7 @@ name: CI on: - push: - tags: - - "v*.*.*" + pull_request: workflow_dispatch: permissions: @@ -38,6 +36,7 @@ jobs: args: --release --out dist sccache: "true" manylinux: auto + rust-toolchain: nightly - name: Upload wheels uses: actions/upload-artifact@v4 with: @@ -67,6 +66,7 @@ jobs: args: --release --out dist sccache: "true" manylinux: musllinux_1_2 + rust-toolchain: nightly - name: Upload wheels uses: actions/upload-artifact@v4 with: @@ -91,6 +91,7 @@ jobs: target: ${{ matrix.platform.target }} args: --release --out dist sccache: "true" + rust-toolchain: nightly - name: Upload wheels uses: actions/upload-artifact@v4 with: @@ -114,6 +115,7 @@ jobs: target: ${{ matrix.platform.target }} args: --release --out dist sccache: "true" + rust-toolchain: nightly - name: Upload wheels uses: actions/upload-artifact@v4 with: @@ -133,24 +135,25 @@ jobs: target: x86_64 command: sdist args: --out dist + rust-toolchain: nightly - name: Upload sdist uses: actions/upload-artifact@v4 with: name: wheels-sdist path: crates/cli/dist - release: - name: Release - runs-on: ubuntu-latest - environment: production - #if: "startsWith(github.ref, 'refs/tags/')" - needs: [linux, musllinux, windows, macos, sdist] - steps: - - uses: actions/download-artifact@v4 - - name: Publish to PyPI - uses: PyO3/maturin-action@v1 - env: - MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }} - with: - command: upload - args: --non-interactive --skip-existing wheels-*/* + #release: + # name: Release + # runs-on: ubuntu-latest + # environment: production + # #if: "startsWith(github.ref, 'refs/tags/')" + # needs: [linux, musllinux, windows, macos, sdist] + # steps: + # - uses: actions/download-artifact@v4 + # - name: Publish to PyPI + # uses: PyO3/maturin-action@v1 + # env: + # MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }} + # with: + # command: upload + # args: --non-interactive --skip-existing wheels-*/* From 96af0c0cd88430545e93510af8852a260620413e Mon Sep 17 00:00:00 2001 From: concur1 Date: Fri, 1 Nov 2024 09:29:53 +0000 Subject: [PATCH 2/6] Changed the trigger back to release and uncommented deployment. --- .github/workflows/python-ci.yaml | 34 +++++++++++++++++--------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/python-ci.yaml b/.github/workflows/python-ci.yaml index 7e15036f..f13832c7 100644 --- a/.github/workflows/python-ci.yaml +++ b/.github/workflows/python-ci.yaml @@ -6,7 +6,9 @@ name: CI on: - pull_request: + push: + tags: + - "v*.*.*" workflow_dispatch: permissions: @@ -142,18 +144,18 @@ jobs: name: wheels-sdist path: crates/cli/dist - #release: - # name: Release - # runs-on: ubuntu-latest - # environment: production - # #if: "startsWith(github.ref, 'refs/tags/')" - # needs: [linux, musllinux, windows, macos, sdist] - # steps: - # - uses: actions/download-artifact@v4 - # - name: Publish to PyPI - # uses: PyO3/maturin-action@v1 - # env: - # MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }} - # with: - # command: upload - # args: --non-interactive --skip-existing wheels-*/* + release: + name: Release + runs-on: ubuntu-latest + environment: production + #if: "startsWith(github.ref, 'refs/tags/')" + needs: [linux, musllinux, windows, macos, sdist] + steps: + - uses: actions/download-artifact@v4 + - name: Publish to PyPI + uses: PyO3/maturin-action@v1 + env: + MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }} + with: + command: upload + args: --non-interactive --skip-existing wheels-*/* From c72d4272ac69bfd0952e7f76e3479fcc4fdd623d Mon Sep 17 00:00:00 2001 From: concur1 Date: Fri, 1 Nov 2024 09:39:16 +0000 Subject: [PATCH 3/6] Use major.minor.patch version for rust toolchain instead off 'nightly'. --- .github/workflows/python-ci.yaml | 44 +++++++++++++++----------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/.github/workflows/python-ci.yaml b/.github/workflows/python-ci.yaml index f13832c7..4c572387 100644 --- a/.github/workflows/python-ci.yaml +++ b/.github/workflows/python-ci.yaml @@ -6,9 +6,7 @@ name: CI on: - push: - tags: - - "v*.*.*" + pull_request: workflow_dispatch: permissions: @@ -38,7 +36,7 @@ jobs: args: --release --out dist sccache: "true" manylinux: auto - rust-toolchain: nightly + rust-toolchain: 1.81.0 - name: Upload wheels uses: actions/upload-artifact@v4 with: @@ -68,7 +66,7 @@ jobs: args: --release --out dist sccache: "true" manylinux: musllinux_1_2 - rust-toolchain: nightly + rust-toolchain: 1.81.0 - name: Upload wheels uses: actions/upload-artifact@v4 with: @@ -93,7 +91,7 @@ jobs: target: ${{ matrix.platform.target }} args: --release --out dist sccache: "true" - rust-toolchain: nightly + rust-toolchain: 1.81.0 - name: Upload wheels uses: actions/upload-artifact@v4 with: @@ -117,7 +115,7 @@ jobs: target: ${{ matrix.platform.target }} args: --release --out dist sccache: "true" - rust-toolchain: nightly + rust-toolchain: 1.81.0 - name: Upload wheels uses: actions/upload-artifact@v4 with: @@ -137,25 +135,25 @@ jobs: target: x86_64 command: sdist args: --out dist - rust-toolchain: nightly + rust-toolchain: 1.81.0 - name: Upload sdist uses: actions/upload-artifact@v4 with: name: wheels-sdist path: crates/cli/dist - release: - name: Release - runs-on: ubuntu-latest - environment: production - #if: "startsWith(github.ref, 'refs/tags/')" - needs: [linux, musllinux, windows, macos, sdist] - steps: - - uses: actions/download-artifact@v4 - - name: Publish to PyPI - uses: PyO3/maturin-action@v1 - env: - MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }} - with: - command: upload - args: --non-interactive --skip-existing wheels-*/* + # release: + # name: Release + # runs-on: ubuntu-latest + # environment: production + # #if: "startsWith(github.ref, 'refs/tags/')" + # needs: [linux, musllinux, windows, macos, sdist] + # steps: + # - uses: actions/download-artifact@v4 + # - name: Publish to PyPI + # uses: PyO3/maturin-action@v1 + # env: + # MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }} + # with: + # command: upload + # args: --non-interactive --skip-existing wheels-*/* From 9579bab5e935c95b548c5312a246989275727258 Mon Sep 17 00:00:00 2001 From: concur1 Date: Fri, 1 Nov 2024 10:00:07 +0000 Subject: [PATCH 4/6] Change rust-toolchain.toml instead of the CI. --- .github/workflows/python-ci.yaml | 2 -- rust-toolchain.toml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/python-ci.yaml b/.github/workflows/python-ci.yaml index 4c572387..07fa9e58 100644 --- a/.github/workflows/python-ci.yaml +++ b/.github/workflows/python-ci.yaml @@ -36,7 +36,6 @@ jobs: args: --release --out dist sccache: "true" manylinux: auto - rust-toolchain: 1.81.0 - name: Upload wheels uses: actions/upload-artifact@v4 with: @@ -115,7 +114,6 @@ jobs: target: ${{ matrix.platform.target }} args: --release --out dist sccache: "true" - rust-toolchain: 1.81.0 - name: Upload wheels uses: actions/upload-artifact@v4 with: diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 292fe499..1de01fa4 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "stable" +channel = "1.81.0" From 4a693b943df9822c44c5803312b976f6fe876d5a Mon Sep 17 00:00:00 2001 From: concur1 Date: Fri, 1 Nov 2024 10:01:04 +0000 Subject: [PATCH 5/6] Delete references to toolchain in CI. --- .github/workflows/python-ci.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/python-ci.yaml b/.github/workflows/python-ci.yaml index 07fa9e58..71cfc220 100644 --- a/.github/workflows/python-ci.yaml +++ b/.github/workflows/python-ci.yaml @@ -65,7 +65,6 @@ jobs: args: --release --out dist sccache: "true" manylinux: musllinux_1_2 - rust-toolchain: 1.81.0 - name: Upload wheels uses: actions/upload-artifact@v4 with: @@ -90,7 +89,6 @@ jobs: target: ${{ matrix.platform.target }} args: --release --out dist sccache: "true" - rust-toolchain: 1.81.0 - name: Upload wheels uses: actions/upload-artifact@v4 with: @@ -133,7 +131,6 @@ jobs: target: x86_64 command: sdist args: --out dist - rust-toolchain: 1.81.0 - name: Upload sdist uses: actions/upload-artifact@v4 with: From 90350350ac9160bbcfd21b2ca7e4961cd3ebc408 Mon Sep 17 00:00:00 2001 From: concur1 Date: Fri, 1 Nov 2024 10:21:32 +0000 Subject: [PATCH 6/6] Updated python ci workflow to run on release. --- .github/workflows/python-ci.yaml | 34 +++++++++++++++++--------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/python-ci.yaml b/.github/workflows/python-ci.yaml index 71cfc220..01c3e67a 100644 --- a/.github/workflows/python-ci.yaml +++ b/.github/workflows/python-ci.yaml @@ -6,7 +6,9 @@ name: CI on: - pull_request: + push: + tags: + - "v*.*.*" workflow_dispatch: permissions: @@ -137,18 +139,18 @@ jobs: name: wheels-sdist path: crates/cli/dist - # release: - # name: Release - # runs-on: ubuntu-latest - # environment: production - # #if: "startsWith(github.ref, 'refs/tags/')" - # needs: [linux, musllinux, windows, macos, sdist] - # steps: - # - uses: actions/download-artifact@v4 - # - name: Publish to PyPI - # uses: PyO3/maturin-action@v1 - # env: - # MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }} - # with: - # command: upload - # args: --non-interactive --skip-existing wheels-*/* + release: + name: Release + runs-on: ubuntu-latest + environment: production + #if: "startsWith(github.ref, 'refs/tags/')" + needs: [linux, musllinux, windows, macos, sdist] + steps: + - uses: actions/download-artifact@v4 + - name: Publish to PyPI + uses: PyO3/maturin-action@v1 + env: + MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }} + with: + command: upload + args: --non-interactive --skip-existing wheels-*/*