Test building dakota 6.21.0

equinor · Dec 20, 2024 · 384b858 · 384b858
1 parent f25ed3c
commit 384b858
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/bundle_with_dakota_caller.yml b/.github/workflows/bundle_with_dakota_caller.yml
@@ -4,7 +4,7 @@ env:
   ERT_SHOW_BACKTRACE: 1
   NO_PROJECT_RES: 1
   BOOST_VERSION: 1.84.0
-  DAKOTA_VERSION: 6.19.0
+  DAKOTA_VERSION: 6.21.0
   INSTALL_DIR: local
   NEEDS_REBUILD: true
 
@@ -20,6 +20,10 @@ on:
         type: boolean
         default: false
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   build-settings:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/bundle_with_dakota_linux.yml b/.github/workflows/bundle_with_dakota_linux.yml
@@ -49,6 +49,7 @@ jobs:
         path: ./deps_build
 
     - name: Build Boost & Dakota
+      timeout-minutes: 75
       if: steps.cache-package-check.outputs.cache-hit != 'true'
       uses: docker://quay.io/pypa/manylinux2014_x86_64
       env:

diff --git a/.github/workflows/bundle_with_dakota_macos.yml b/.github/workflows/bundle_with_dakota_macos.yml
@@ -94,6 +94,7 @@ jobs:
         python -m pip install numpy==1.26.4
 
     - name: Build needed boost libraries
+      timeout-minutes: 30
       if: steps.cache-package.outputs.cache-hit != 'true'
       run: |
         python --version
@@ -110,9 +111,12 @@ jobs:
         python_bin_include_lib="    using python : $python_version : $(python -c "from sysconfig import get_paths as gp; g=gp(); print(f\"$(which python) : {g['include']} : {g['stdlib']} ;\")")"
         sed -i '' "s|.*using python.*|$python_bin_include_lib|" project-config.jam
         cd /tmp/build/boost_${BOOST_VERSION_UNDERSCORES}
-        ./b2 install -j4 -a cxxflags="-std=c++17" --prefix=${GITHUB_WORKSPACE}/${INSTALL_DIR}
+
+        ncpu=$(sysctl -n hw.ncpu)
+        ./b2 install -j"$ncpu" -a cxxflags="-std=c++17" --prefix=${GITHUB_WORKSPACE}/${INSTALL_DIR}
 
     - name: Build dakota
+      timeout-minutes: 30
       if: steps.cache-package.outputs.cache-hit != 'true'
       run: |
         python --version
@@ -173,7 +177,8 @@ jobs:
           -DCMAKE_INSTALL_PREFIX="${GITHUB_WORKSPACE}/${INSTALL_DIR}" \
           ..
 
-        make -j4 install
+        ncpu=$(sysctl -n hw.ncpu)
+        make -j"$ncpu" install
 
     - name: Package built boost and dakota
       if: steps.cache-package.outputs.cache-hit != 'true'