From 4c0effdbf74263f9cb9cf6cba6708d537194775f Mon Sep 17 00:00:00 2001 From: Miranda Mundt Date: Mon, 19 Feb 2024 14:00:23 -0700 Subject: [PATCH 1/8] Add overwrite flag --- .github/workflows/release_wheel_creation.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release_wheel_creation.yml b/.github/workflows/release_wheel_creation.yml index ef44806d6d4..f978415e99e 100644 --- a/.github/workflows/release_wheel_creation.yml +++ b/.github/workflows/release_wheel_creation.yml @@ -45,6 +45,7 @@ jobs: with: name: native_wheels path: dist/*.whl + overwrite: true alternative_wheels: name: Build wheels (${{ matrix.wheel-version }}) on ${{ matrix.os }} for aarch64 @@ -76,6 +77,7 @@ jobs: with: name: alt_wheels path: dist/*.whl + overwrite: true generictarball: name: ${{ matrix.TARGET }} @@ -106,4 +108,5 @@ jobs: with: name: generictarball path: dist + overwrite: true From 153e24920cfa77ffe418dfba3a77178c900dc8b3 Mon Sep 17 00:00:00 2001 From: Miranda Mundt Date: Mon, 19 Feb 2024 14:07:05 -0700 Subject: [PATCH 2/8] Update action version --- .github/workflows/release_wheel_creation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_wheel_creation.yml b/.github/workflows/release_wheel_creation.yml index f978415e99e..19c2a6c50a9 100644 --- a/.github/workflows/release_wheel_creation.yml +++ b/.github/workflows/release_wheel_creation.yml @@ -29,7 +29,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v2.16.2 + uses: pypa/cibuildwheel@v2 with: output-dir: dist env: @@ -63,7 +63,7 @@ jobs: with: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v2.16.2 + uses: pypa/cibuildwheel@v2 with: output-dir: dist env: From fcb7cef0f64fe3457f3b2e955bb41ba5c8831189 Mon Sep 17 00:00:00 2001 From: Miranda Mundt Date: Mon, 19 Feb 2024 14:11:56 -0700 Subject: [PATCH 3/8] Update action version --- .github/workflows/release_wheel_creation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_wheel_creation.yml b/.github/workflows/release_wheel_creation.yml index 19c2a6c50a9..2dd44652489 100644 --- a/.github/workflows/release_wheel_creation.yml +++ b/.github/workflows/release_wheel_creation.yml @@ -29,7 +29,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v2 + uses: pypa/cibuildwheel@v2.16.5 with: output-dir: dist env: @@ -63,7 +63,7 @@ jobs: with: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v2 + uses: pypa/cibuildwheel@v2.16.5 with: output-dir: dist env: From a80c20605e61f764ec2371683676ace2739f0a96 Mon Sep 17 00:00:00 2001 From: Miranda Mundt Date: Mon, 19 Feb 2024 14:18:19 -0700 Subject: [PATCH 4/8] Change from overwrite to merge --- .github/workflows/release_wheel_creation.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release_wheel_creation.yml b/.github/workflows/release_wheel_creation.yml index 2dd44652489..203b4f391c7 100644 --- a/.github/workflows/release_wheel_creation.yml +++ b/.github/workflows/release_wheel_creation.yml @@ -45,7 +45,7 @@ jobs: with: name: native_wheels path: dist/*.whl - overwrite: true + merge-multiple: true alternative_wheels: name: Build wheels (${{ matrix.wheel-version }}) on ${{ matrix.os }} for aarch64 @@ -77,7 +77,7 @@ jobs: with: name: alt_wheels path: dist/*.whl - overwrite: true + merge-multiple: true generictarball: name: ${{ matrix.TARGET }} @@ -108,5 +108,5 @@ jobs: with: name: generictarball path: dist - overwrite: true + merge-multiple: true From 88aab73d33d8cfaecef8337a3121f986285f6a2a Mon Sep 17 00:00:00 2001 From: Miranda Mundt Date: Mon, 19 Feb 2024 14:24:49 -0700 Subject: [PATCH 5/8] Have to give unique names now. Yay. --- .github/workflows/release_wheel_creation.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release_wheel_creation.yml b/.github/workflows/release_wheel_creation.yml index 203b4f391c7..d847b0f2cff 100644 --- a/.github/workflows/release_wheel_creation.yml +++ b/.github/workflows/release_wheel_creation.yml @@ -43,9 +43,9 @@ jobs: CIBW_CONFIG_SETTINGS: '--global-option="--with-cython --with-distributable-extensions"' - uses: actions/upload-artifact@v4 with: - name: native_wheels + name: alt_wheels-${{ matrix.os }}-${{ matrix.wheel-version }} path: dist/*.whl - merge-multiple: true + overwrite: true alternative_wheels: name: Build wheels (${{ matrix.wheel-version }}) on ${{ matrix.os }} for aarch64 @@ -75,9 +75,9 @@ jobs: CIBW_CONFIG_SETTINGS: '--global-option="--with-cython --with-distributable-extensions"' - uses: actions/upload-artifact@v4 with: - name: alt_wheels + name: alt_wheels-${{ matrix.os }}-${{ matrix.wheel-version }} path: dist/*.whl - merge-multiple: true + overwrite: true generictarball: name: ${{ matrix.TARGET }} @@ -108,5 +108,5 @@ jobs: with: name: generictarball path: dist - merge-multiple: true + overwrite: true From dd9cf09b290302e854eb032644cf9e0ed8ee9509 Mon Sep 17 00:00:00 2001 From: Miranda Mundt Date: Mon, 19 Feb 2024 14:35:52 -0700 Subject: [PATCH 6/8] Add fail fast; target names --- .github/workflows/release_wheel_creation.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_wheel_creation.yml b/.github/workflows/release_wheel_creation.yml index d847b0f2cff..6b65938706c 100644 --- a/.github/workflows/release_wheel_creation.yml +++ b/.github/workflows/release_wheel_creation.yml @@ -22,10 +22,23 @@ jobs: name: Build wheels (${{ matrix.wheel-version }}) on ${{ matrix.os }} for native and cross-compiled architecture runs-on: ${{ matrix.os }} strategy: + fail-fast: true matrix: os: [ubuntu-22.04, windows-latest, macos-latest] arch: [all] wheel-version: ['cp38*', 'cp39*', 'cp310*', 'cp311*', 'cp312*'] + + include: + - wheel-version: 'cp38*' + TARGET: 'py38' + - wheel-version: 'cp39*' + TARGET: 'py39' + - wheel-version: 'cp310*' + TARGET: 'py310' + - wheel-version: 'cp311*' + TARGET: 'py311' + - wheel-version: 'cp312*' + TARGET: 'py312' steps: - uses: actions/checkout@v4 - name: Build wheels @@ -43,7 +56,7 @@ jobs: CIBW_CONFIG_SETTINGS: '--global-option="--with-cython --with-distributable-extensions"' - uses: actions/upload-artifact@v4 with: - name: alt_wheels-${{ matrix.os }}-${{ matrix.wheel-version }} + name: alt_wheels-${{ matrix.os }}-${{ matrix.TARGET }} path: dist/*.whl overwrite: true @@ -75,7 +88,7 @@ jobs: CIBW_CONFIG_SETTINGS: '--global-option="--with-cython --with-distributable-extensions"' - uses: actions/upload-artifact@v4 with: - name: alt_wheels-${{ matrix.os }}-${{ matrix.wheel-version }} + name: alt_wheels-${{ matrix.os }}-${{ matrix.TARGET }} path: dist/*.whl overwrite: true From 8c643ca08867b646a7dea8964ff20061737ee1fb Mon Sep 17 00:00:00 2001 From: Miranda Mundt Date: Mon, 19 Feb 2024 14:57:34 -0700 Subject: [PATCH 7/8] Copy-pasta failure --- .github/workflows/release_wheel_creation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_wheel_creation.yml b/.github/workflows/release_wheel_creation.yml index 6b65938706c..17152dc3d1e 100644 --- a/.github/workflows/release_wheel_creation.yml +++ b/.github/workflows/release_wheel_creation.yml @@ -56,7 +56,7 @@ jobs: CIBW_CONFIG_SETTINGS: '--global-option="--with-cython --with-distributable-extensions"' - uses: actions/upload-artifact@v4 with: - name: alt_wheels-${{ matrix.os }}-${{ matrix.TARGET }} + name: native_wheels-${{ matrix.os }}-${{ matrix.TARGET }} path: dist/*.whl overwrite: true From 3828841bf5e327f69c5369acd9ce089e28a81751 Mon Sep 17 00:00:00 2001 From: Miranda Mundt Date: Mon, 19 Feb 2024 16:33:21 -0700 Subject: [PATCH 8/8] Forgot targets for alt_wheels --- .github/workflows/release_wheel_creation.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/release_wheel_creation.yml b/.github/workflows/release_wheel_creation.yml index 17152dc3d1e..932b0d8eea6 100644 --- a/.github/workflows/release_wheel_creation.yml +++ b/.github/workflows/release_wheel_creation.yml @@ -68,6 +68,18 @@ jobs: os: [ubuntu-22.04] arch: [all] wheel-version: ['cp38*', 'cp39*', 'cp310*', 'cp311*', 'cp312*'] + + include: + - wheel-version: 'cp38*' + TARGET: 'py38' + - wheel-version: 'cp39*' + TARGET: 'py39' + - wheel-version: 'cp310*' + TARGET: 'py310' + - wheel-version: 'cp311*' + TARGET: 'py311' + - wheel-version: 'cp312*' + TARGET: 'py312' steps: - uses: actions/checkout@v4 - name: Set up QEMU