Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 0.3.0 release process changes back into master #893

Merged
merged 7 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/actions/ngen-build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,12 @@ runs:
tar xjf boost_1_79_0.tar.bz2
shell: bash

- name: Set Pip Constraints
run: |
echo "numpy<2.0" > $GITHUB_WORKSPACE/constraints.txt
echo "PIP_CONSTRAINT=$GITHUB_WORKSPACE/constraints.txt" >> $GITHUB_ENV
shell: bash

- name: Cache Python Dependencies
id: cache-py3-dependencies
uses: actions/cache@v3
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/Example_model_run.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
name: Build and Run NGEN on example data

on:
push:
branches: [ release-* ]
pull_request:
branches: [ master ]
branches: [ master, release-* ]
jobs:
Build_and_Run_Model:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: Documentation
# events but only for the master branch
on:
push:
branches: [ master ]
branches: [ master, release-* ]
#pull_request:
#branches: [ master ]

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/module_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: Module Integration Tests
# Controls when the action will run.
on:
push:
branches: [ master, dev, notreal ]
branches: [ master, dev, notreal, release-* ]
pull_request:
branches: [ master, dev, notreal ]
branches: [ master, dev, notreal, release-* ]
workflow_dispatch:

env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_and_validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ name: Testing and Validation
# Controls when the action will run.
on:
push:
branches: [ master, dev, notreal ]
branches: [ master, dev, notreal, release-* ]
pull_request:
branches: [ master, dev, notreal ]
branches: [ master, dev, notreal, release-* ]
workflow_dispatch:

env:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
set(CMAKE_CXX_VISIBILITY_PRESET hidden)

# Define project version and use via generated config header
project(ngen VERSION 0.2.0)
project(ngen VERSION 0.3.0)

add_executable(ngen "${NGEN_SRC_DIR}/NGen.cpp")

Expand Down
Loading