From 384b8589c025d510153fd42e1f59108a7b9b7939 Mon Sep 17 00:00:00 2001
From: Andreas Eknes Lie <andrli@equinor.com>
Date: Fri, 20 Dec 2024 13:51:02 +0100
Subject: [PATCH 1/2] Test building dakota 6.21.0

---
 .github/workflows/bundle_with_dakota_caller.yml | 6 +++++-
 .github/workflows/bundle_with_dakota_linux.yml  | 1 +
 .github/workflows/bundle_with_dakota_macos.yml  | 9 +++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/bundle_with_dakota_caller.yml b/.github/workflows/bundle_with_dakota_caller.yml
index 5dcf3940..a972d74e 100644
--- 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
index 4fd92d3f..4df8b0db 100644
--- 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
index d36e8406..5e1cc383 100644
--- 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'

From 37dc62218dce1bd50faffd8cf71142bda6d3a75b Mon Sep 17 00:00:00 2001
From: Andreas Eknes Lie <andrli@equinor.com>
Date: Fri, 20 Dec 2024 13:52:00 +0100
Subject: [PATCH 2/2] Print ubuntu build

---
 dakota_manylinux_install_files/build_deps_gha.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dakota_manylinux_install_files/build_deps_gha.sh b/dakota_manylinux_install_files/build_deps_gha.sh
index 9931587a..3472aecb 100644
--- a/dakota_manylinux_install_files/build_deps_gha.sh
+++ b/dakota_manylinux_install_files/build_deps_gha.sh
@@ -164,8 +164,8 @@ $($cmake_command &> /github/workspace/trace/dakota_bootstrap.log)
 
 echo "# make --debug=b -j8 install" >> /github/workspace/trace/env
 echo "Building Dakota ..."
-make --debug=b -j8 install &> /github/workspace/trace/dakota_install.log
-
+#make --debug=b -j8 install &> /github/workspace/trace/dakota_install.log
+make --debug=b -j8 install
 
 DEPS_BUILD=/github/workspace/deps_build