Skip to content

Commit f9036c4

Browse files
committed
consolidate swmm_toolkit wheels
1 parent bd0fa37 commit f9036c4

1 file changed

Lines changed: 26 additions & 10 deletions

File tree

.github/workflows/build_wheel.yml

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,15 @@ jobs:
1919
defaults:
2020
run:
2121
working-directory: ./nrtest-swmm
22-
2322
steps:
2423
- name: Checkout repo
25-
uses: actions/checkout@v5
26-
24+
uses: actions/checkout@v3
25+
with:
26+
submodules: true
2727
- name: Install Python
2828
uses: actions/setup-python@v5
2929
with:
3030
python-version: "3.10"
31-
3231
- name: Build wheel
3332
run: |
3433
pip install wheel
@@ -39,21 +38,18 @@ jobs:
3938
with:
4039
name: nrtest-swmm-wheel
4140
path: nrtest-swmm/dist/*.whl
42-
4341

4442
build_wheels:
4543
runs-on: ${{ matrix.os }}
4644
strategy:
4745
fail-fast: false
4846
matrix:
4947
os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-13, macos-latest]
50-
5148
steps:
5249
- name: Checkout repo
5350
uses: actions/checkout@v5
5451
with:
5552
submodules: true
56-
5753
- name: Build wheels
5854
uses: pypa/cibuildwheel@v3.1.4
5955
with:
@@ -62,10 +58,8 @@ jobs:
6258
MACOSX_DEPLOYMENT_TARGET: "11.0"
6359
CIBW_TEST_COMMAND: "pytest {package}/tests"
6460
CIBW_BEFORE_TEST: pip install -r {package}/test-requirements.txt
65-
6661
CIBW_ENVIRONMENT_MACOS: |
6762
MACOSX_DEPLOYMENT_TARGET=11.0
68-
6963
# remove system swig (cmake bug doesn't respect python venv)
7064
# https://github.com/swig/swig/issues/2481#issuecomment-1949573105
7165
CIBW_BEFORE_BUILD_LINUX: rm -f $(which swig) && rm -f $(which swig4.0)
@@ -76,11 +70,33 @@ jobs:
7670
# Skip trying to test arm64 builds on Intel Macs
7771
CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x} *-macosx_universal2:arm64"
7872
CIBW_BUILD_VERBOSITY: 1
79-
8073
- uses: actions/upload-artifact@v4
8174
with:
8275
name: wheelhouse_${{ matrix.os }}
8376
path: ./wheelhouse/*.whl
8477

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

86102

0 commit comments

Comments
 (0)