From efa639eb8cdc6b69b0a1b9baa15f1797357165c8 Mon Sep 17 00:00:00 2001 From: Christopher Rabotin Date: Tue, 21 Nov 2023 22:37:08 -0700 Subject: [PATCH 1/4] Trying to allow re-release manually --- .github/workflows/python.yml | 6 +++++- .github/workflows/rust.yaml | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 0de70854..96e6aed1 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -95,6 +95,10 @@ jobs: - uses: actions/setup-python@v4 with: python-version: "3.11" + + - name: Update cargo packages + run: cargo update + - name: Build wheels uses: PyO3/maturin-action@v1 with: @@ -136,7 +140,7 @@ jobs: release: name: Release runs-on: ubuntu-latest - if: ${{ startsWith(github.ref, 'refs/tags/') }} + if: github.ref_type == 'tag' || github.event_name == 'workflow_dispatch' needs: [linux, windows, macos, sdist] steps: - uses: actions/download-artifact@v3 diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index 00ae169d..4f7b2f47 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -158,9 +158,6 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v3 - - - name: release-plz - uses: MarcoIeni/release-plz-action@v0.5.2 - name: Install stable toolchain uses: dtolnay/rust-toolchain@master From 41db85d67f7e604c5012b5cab1ff5b820c93b021 Mon Sep 17 00:00:00 2001 From: Christopher Rabotin Date: Tue, 21 Nov 2023 22:40:01 -0700 Subject: [PATCH 2/4] Force macos toolchain to be 1.73 --- .github/workflows/python.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 96e6aed1..d4251c9a 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -105,6 +105,7 @@ jobs: target: ${{ matrix.target }} args: --release --out dist --find-interpreter -F python sccache: 'true' + rust-toolchain: 1.73 - name: Upload wheels uses: actions/upload-artifact@v3 From 6c7c4790d21fb7a485dcb00efecd73796f98c709 Mon Sep 17 00:00:00 2001 From: Christopher Rabotin Date: Tue, 21 Nov 2023 22:55:58 -0700 Subject: [PATCH 3/4] Force release this one time --- .github/workflows/python.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index d4251c9a..9faa325d 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -30,7 +30,7 @@ jobs: target: ${{ matrix.target }} args: --release --out dist --find-interpreter -F python sccache: 'true' - # manylinux: false + rust-toolchain: 1.73 - name: Upload wheels uses: actions/upload-artifact@v3 @@ -69,7 +69,7 @@ jobs: with: target: ${{ matrix.target }} args: --release --out dist --find-interpreter -F python - # sccache: 'true' # sscache seems to have broken on Windows on Github -- https://github.com/nyx-space/nyx/actions/runs/5156694943/jobs/9288035780 + rust-toolchain: 1.73 - name: Upload wheels uses: actions/upload-artifact@v3 with: @@ -132,6 +132,7 @@ jobs: with: command: sdist args: --out dist + rust-toolchain: 1.73 - name: Upload sdist uses: actions/upload-artifact@v3 with: @@ -141,7 +142,7 @@ jobs: release: name: Release runs-on: ubuntu-latest - if: github.ref_type == 'tag' || github.event_name == 'workflow_dispatch' + # if : github.ref_type == 'tag' || github.event_name == 'workflow_dispatch' needs: [linux, windows, macos, sdist] steps: - uses: actions/download-artifact@v3 From 83c5b257aab8feb7afeb796dd8e7cb0ee9f22a11 Mon Sep 17 00:00:00 2001 From: Christopher Rabotin Date: Tue, 21 Nov 2023 23:20:06 -0700 Subject: [PATCH 4/4] Release Python only on demand, and force toolchain version --- .github/workflows/python.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 9faa325d..dfb69b5a 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -30,7 +30,7 @@ jobs: target: ${{ matrix.target }} args: --release --out dist --find-interpreter -F python sccache: 'true' - rust-toolchain: 1.73 + rust-toolchain: 1.74 - name: Upload wheels uses: actions/upload-artifact@v3 @@ -69,7 +69,7 @@ jobs: with: target: ${{ matrix.target }} args: --release --out dist --find-interpreter -F python - rust-toolchain: 1.73 + rust-toolchain: 1.74 - name: Upload wheels uses: actions/upload-artifact@v3 with: @@ -105,7 +105,7 @@ jobs: target: ${{ matrix.target }} args: --release --out dist --find-interpreter -F python sccache: 'true' - rust-toolchain: 1.73 + rust-toolchain: 1.74 - name: Upload wheels uses: actions/upload-artifact@v3 @@ -132,7 +132,7 @@ jobs: with: command: sdist args: --out dist - rust-toolchain: 1.73 + rust-toolchain: 1.74 - name: Upload sdist uses: actions/upload-artifact@v3 with: @@ -142,7 +142,7 @@ jobs: release: name: Release runs-on: ubuntu-latest - # if : github.ref_type == 'tag' || github.event_name == 'workflow_dispatch' + if: github.ref_type == 'tag' needs: [linux, windows, macos, sdist] steps: - uses: actions/download-artifact@v3