diff --git a/.github/actions/ngen-build/action.yaml b/.github/actions/ngen-build/action.yaml index cfd01eacaa..8c0f79730b 100644 --- a/.github/actions/ngen-build/action.yaml +++ b/.github/actions/ngen-build/action.yaml @@ -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 diff --git a/.github/workflows/Example_model_run.yml b/.github/workflows/Example_model_run.yml index b67e5cf1a1..d45dd59bcf 100644 --- a/.github/workflows/Example_model_run.yml +++ b/.github/workflows/Example_model_run.yml @@ -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 diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 181544ae38..782dd19a1c 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -6,7 +6,7 @@ name: Documentation # events but only for the master branch on: push: - branches: [ master ] + branches: [ master, release-* ] #pull_request: #branches: [ master ] diff --git a/.github/workflows/module_integration.yml b/.github/workflows/module_integration.yml index 10a47c8869..b89c629079 100644 --- a/.github/workflows/module_integration.yml +++ b/.github/workflows/module_integration.yml @@ -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: diff --git a/.github/workflows/test_and_validate.yml b/.github/workflows/test_and_validate.yml index 31c9b8cb14..00279ae8d8 100644 --- a/.github/workflows/test_and_validate.yml +++ b/.github/workflows/test_and_validate.yml @@ -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: diff --git a/CMakeLists.txt b/CMakeLists.txt index 9dabce84ae..35152e9ab1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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")