Skip to content

Commit e30983b

Browse files
committed
consolidate swmm_toolkit wheels
1 parent 511d136 commit e30983b

File tree

1 file changed

+24
-11
lines changed

1 file changed

+24
-11
lines changed

.github/workflows/build_wheel.yml

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,15 @@ jobs:
1919
defaults:
2020
run:
2121
working-directory: ./nrtest-swmm
22-
2322
steps:
2423
- name: Checkout repo
2524
uses: actions/checkout@v3
2625
with:
2726
submodules: true
28-
2927
- name: Install Python
3028
uses: actions/setup-python@v4
3129
with:
3230
python-version: "3.10"
33-
3431
- name: Build wheel
3532
run: |
3633
pip install wheel
@@ -39,32 +36,26 @@ jobs:
3936
with:
4037
path: nrtest-swmm/dist/*.whl
4138

42-
43-
4439
build_wheels:
4540
runs-on: ${{ matrix.os }}
4641
strategy:
4742
fail-fast: false
4843
matrix:
4944
os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-13, macos-latest]
50-
5145
steps:
5246
- name: Checkout repo
5347
uses: actions/checkout@v5
5448
with:
5549
submodules: true
56-
5750
- name: Build wheels
5851
uses: pypa/[email protected]
5952
with:
6053
package-dir: ./swmm-toolkit
6154
env:
6255
CIBW_TEST_COMMAND: "pytest {package}/tests"
6356
CIBW_BEFORE_TEST: pip install -r {package}/test-requirements.txt
64-
6557
CIBW_ENVIRONMENT_MACOS: |
6658
MACOSX_DEPLOYMENT_TARGET=11.0
67-
6859
# remove system swig (cmake bug doesn't respect python venv)
6960
# https://github.com/swig/swig/issues/2481#issuecomment-1949573105
7061
CIBW_BEFORE_BUILD_LINUX: rm -f $(which swig) && rm -f $(which swig4.0)
@@ -75,11 +66,33 @@ jobs:
7566
# Skip trying to test arm64 builds on Intel Macs
7667
CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x} *-macosx_arm64 *-macosx_universal2:arm64"
7768
CIBW_BUILD_VERBOSITY: 1
78-
7969
- uses: actions/upload-artifact@v4
8070
with:
8171
name: wheelhouse_${{ matrix.os }}
8272
path: ./wheelhouse/*.whl
8373

74+
merge_wheels:
75+
name: Consolidate all wheel artifacts
76+
runs-on: ubuntu-latest
77+
needs:
78+
- build_wheels
79+
steps:
80+
- name: Download all wheel artifacts
81+
uses: actions/download-artifact@v5
82+
with:
83+
path: wheelhouse
84+
pattern: wheelhouse*
85+
merge-multiple: true
86+
- name: List downloaded wheels
87+
run: ls -l wheelhouse
88+
- name: Create consolidated archive
89+
run: |
90+
cd wheelhouse
91+
zip -r ../all_swmm_toolkit_wheels.zip .
92+
- name: Upload consolidated archive
93+
uses: actions/upload-artifact@v4
94+
with:
95+
name: all_swmm_toolkit_wheels
96+
path: all_swmm_toolkit_wheels.zip
8497

85-
98+

0 commit comments

Comments
 (0)