Skip to content

Commit ebc35ad

Browse files
cbuahincbuahin
committed
Cleaning up build and fixing install on windows
Signed-off-by: Caleb <calebgh@gmail.com>
1 parent 2763347 commit ebc35ad

25 files changed

+6276
-38
lines changed

.github/workflows/deploying.yml renamed to .github/workflows/deployment.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
name: Build Binaries for Deployment
1+
name: Deployment
22

33
on:
44
push:
55
branches: [ master, bug_fixes]
6+
tags: [ 'v*.*.*' ]
67
pull_request:
78
branches: [ master]
89

.github/workflows/build_docs.yml renamed to .github/workflows/documentation.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
name: Build and Deploy Docs
1+
name: Documentation
22
on:
33
push:
4-
branches: [docs ]
4+
branches: [docs, bug_fixes ]
5+
tags: [v*.*.*]
56

67
pull_request:
78
branches: [release, docs ]

‎.github/workflows/regression_testing.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build and Unit Test
1+
name: Regression Testing
22

33
on:
44
push:

‎.github/workflows/unit_testing.yml‎

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build and Unit Test
1+
name: Unit Testing
22

33
on:
44
push:
@@ -158,13 +158,41 @@ jobs:
158158
- name: Checkout SWMM Repo
159159
uses: actions/checkout@v4
160160

161+
# - name: Checkout VCPKG
162+
# uses: actions/checkout@v4
163+
# with:
164+
# repository: microsoft/vcpkg
165+
# ref: 2025.02.14
166+
# path: vcpkg
167+
161168
- name: Install OpenMP and Ninja (MacOS)
162169
if: ${{ matrix.os == 'macos-latest' || matrix.os == 'macos-13' }}
163170
run: |
164171
brew reinstall libomp
165172
brew link --force --overwrite libomp
166173
brew install ninja
167-
174+
175+
# - name: Bootstrap VCPKG (Windows)
176+
# if: ${{ matrix.os == 'windows-latest' }}
177+
# working-directory: ${{ env.VCPKG_ROOT }}
178+
# run: |
179+
# .\bootstrap-vcpkg${{ matrix.shell_extension }}
180+
# .\vcpkg.exe integrate install
181+
182+
# - name: Bootstrap VCPKG (Unix like)
183+
# if: ${{ matrix.os != 'windows-latest' }}
184+
# working-directory: ${{ env.VCPKG_ROOT }}
185+
# run: |
186+
# ./bootstrap-vcpkg${{ matrix.shell_extension }}
187+
# chmod +x vcpkg
188+
189+
# - name: Export GitHub Actions cache environment variables
190+
# uses: actions/github-script@v7
191+
# with:
192+
# script: |
193+
# core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
194+
# core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
195+
168196
- name: Setup python
169197
uses: actions/setup-python@v4
170198
with:
@@ -194,6 +222,19 @@ jobs:
194222
python setup.py clean --all
195223
python -m build .
196224
225+
# - name: Build Wheels
226+
# uses: pypa/cibuildwheel@v2.23.2
227+
# with:
228+
# package-dir: ./python
229+
# output-dir: ./python/wheelhouse
230+
# env:
231+
# CMAKE_OSX_ARCHITECTURES: ${{ matrix.cmake_osx_arch }}
232+
# # CIBW_TEST_COMMAND: "python {package}/setup.py build_ext --inplace && python -m pip install {package} && python -m pytest {package}/tests -v"
233+
# CIBW_BEFORE_TEST: "pip install -r {package}/requirements.txt && python -m pip install ninja"
234+
# CIBW_BUILD_VERBOSITY: 1
235+
# CIBW_BEFORE_BUILD_MACOS: brew install ninja
236+
# CIBW_REPAIR_WHEEL_COMMAND: ${{ matrix.os == 'ubuntu-latest' && 'auditwheel repair -w {dest_dir} {wheel}' || '' }}
237+
197238
- name: Upload Python Wheels
198239
if: ${{ always() }}
199240
uses: actions/upload-artifact@v4

‎README.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ EPA ORD Stormwater Management Model (SWMM)
44
Stormwater Management Model (SWMM) computational engine and output post-processing codebase
55

66
## Build Status
7-
[![Build and Unit Testing](https://github.com/USEPA/Stormwater-Management-Model/actions/workflows/unit_testing.yml/badge.svg)](https://github.com/USEPA/Stormwater-Management-Model/actions/workflows/unit_testing.yml)
7+
[![Unit Testing](https://github.com/USEPA/Stormwater-Management-Model/actions/workflows/unit_testing.yml/badge.svg)](https://github.com/USEPA/Stormwater-Management-Model/actions/workflows/unit_testing.yml)
88
[![Build and Regression Testing](https://github.com/USEPA/Stormwater-Management-Model/actions/workflows/regression_testing.yml/badge.svg)](https://github.com/USEPA/Stormwater-Management-Model/actions/workflows/regression_testing.yml)
9-
[![Documentation](https://github.com/USEPA/Stormwater-Management-Model/actions/workflows/build_docs.yml/badge.svg)](https://github.com/USEPA/Stormwater-Management-Model/actions/workflows/build_docs.yml)
10-
[![Deployment](https://github.com/USEPA/Stormwater-Management-Model/actions/workflows/deploying.yml/badge.svg)](https://github.com/USEPA/Stormwater-Management-Model/actions/workflows/deploying.yml)
9+
[![Docs](https://github.com/USEPA/Stormwater-Management-Model/actions/workflows/build_docs.yml/badge.svg)](https://github.com/USEPA/Stormwater-Management-Model/actions/workflows/build_docs.yml)
10+
[![Deployment](https://github.com/USEPA/Stormwater-Management-Model/actions/workflows/deploy.yml/badge.svg)](https://github.com/USEPA/Stormwater-Management-Model/actions/workflows/deploy.yml)
11+
[![Documentation](https://github.com/USEPA/Stormwater-Management-Model/actions/workflows/build-and-test.yml/badge.svg?branch=docs)](https://github.com/USEPA/Stormwater-Management-Model/actions/workflows/build-and-test.yml)
1112
[![Issues](https://img.shields.io/github/issues/USEPA/Stormwater-Management-Model)](https://github.com/USEPA/Stormwater-Management-Model/issues)
1213

1314
## Python Binding
@@ -164,7 +165,7 @@ pytest --data-dir <path-to-regression-testing-files> --atol <absolute-tolerance>
164165
The source code distributed here is identical to the code found at the official [SWMM website](https://www.epa.gov/water-research/storm-water-management-model-swmm).
165166
The SWMM website also hosts the official manuals and installation binaries for the SWMM software.
166167

167-
A live web version of the SWMM documentation of the API and user manuals can be found on the [SWMM GitHub Pages website](https://usepa.github.io/Stormwater-Management-Model). Note that this is an experimental version that is still under development and has yet to go through EPA'S official quality assurance review process.
168+
A live web version of the SWMM documentation of the API and user manuals can be found on the [SWMM GitHub Pages website](https://USEPA.github.io/Stormwater-Management-Model). Note that this is an experimental version that is still under development and has yet to go through EPA'S official quality assurance review process.
168169

169170
## Disclaimer
170171
The United States Environmental Protection Agency (EPA) GitHub project code is provided on an "as is" basis and the user assumes responsibility for its use. EPA has relinquished control of the information and no longer has responsibility to protect the integrity, confidentiality, or availability of the information. Any reference to specific commercial products, processes, or services by service mark, trademark, manufacturer, or otherwise, does not constitute or imply their endorsement, recommendation or favoring by EPA. The EPA seal and logo shall not be used in any manner to imply endorsement of any commercial product or activity by EPA or the United States Government.

0 commit comments

Comments
 (0)