Merge pull request #2116 from DARMA-tasking/2115-use-newer-cmake

#2115: Update CMake min required version to 3.23
DARMA-tasking · Mar 30, 2023 · ff01554 · ff01554
2 parents db009ff + 19461b2
commit ff01554
Show file tree

Hide file tree

Showing 25 changed files with 48 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.17 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23 FATAL_ERROR)
 
 file(READ "VERSION" _vt_version_str)
 string(STRIP "${_vt_version_str}" _vt_version_str)

diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml
@@ -74,6 +74,8 @@ stages:
       vmImage: 'ubuntu-22.04'
     timeoutInMinutes: 180
     steps:
+      - checkout: self
+        fetchDepth: 0
       - task: Bash@3
         displayName: Build timestamp for caching
         continueOnError: true

diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml
@@ -74,6 +74,8 @@ stages:
       vmImage: 'ubuntu-22.04'
     timeoutInMinutes: 180
     steps:
+      - checkout: self
+        fetchDepth: 0
       - task: Bash@3
         displayName: Build timestamp for caching
         continueOnError: true

diff --git a/ci/azure/azure-clang-12-ubuntu-mpich.yml b/ci/azure/azure-clang-12-ubuntu-mpich.yml
@@ -74,6 +74,8 @@ stages:
       vmImage: 'ubuntu-22.04'
     timeoutInMinutes: 180
     steps:
+      - checkout: self
+        fetchDepth: 0
       - task: Bash@3
         displayName: Build timestamp for caching
         continueOnError: true

diff --git a/ci/azure/azure-clang-13-ubuntu-mpich.yml b/ci/azure/azure-clang-13-ubuntu-mpich.yml
@@ -74,6 +74,8 @@ stages:
       vmImage: 'ubuntu-22.04'
     timeoutInMinutes: 180
     steps:
+      - checkout: self
+        fetchDepth: 0
       - task: Bash@3
         displayName: Build timestamp for caching
         continueOnError: true

diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml
@@ -74,6 +74,8 @@ stages:
       vmImage: 'ubuntu-22.04'
     timeoutInMinutes: 180
     steps:
+      - checkout: self
+        fetchDepth: 0
       - task: Bash@3
         displayName: Build timestamp for caching
         continueOnError: true

diff --git a/ci/azure/azure-clang-9-ubuntu-mpich.yml b/ci/azure/azure-clang-9-ubuntu-mpich.yml
@@ -74,6 +74,8 @@ stages:
       vmImage: 'ubuntu-22.04'
     timeoutInMinutes: 180
     steps:
+      - checkout: self
+        fetchDepth: 0
       - task: Bash@3
         displayName: Build timestamp for caching
         continueOnError: true

diff --git a/ci/azure/azure-clang-alpine-mpich.yml b/ci/azure/azure-clang-alpine-mpich.yml
@@ -74,6 +74,8 @@ stages:
       vmImage: 'ubuntu-22.04'
     timeoutInMinutes: 180
     steps:
+      - checkout: self
+        fetchDepth: 0
       - task: Bash@3
         displayName: Build timestamp for caching
         continueOnError: true

diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml
@@ -74,6 +74,8 @@ stages:
       vmImage: 'ubuntu-22.04'
     timeoutInMinutes: 180
     steps:
+      - checkout: self
+        fetchDepth: 0
       - task: Bash@3
         displayName: Build timestamp for caching
         continueOnError: true

diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml
@@ -74,6 +74,8 @@ stages:
       vmImage: 'ubuntu-22.04'
     timeoutInMinutes: 180
     steps:
+      - checkout: self
+        fetchDepth: 0
       - task: Bash@3
         displayName: Build timestamp for caching
         continueOnError: true

diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml
@@ -74,6 +74,8 @@ stages:
       vmImage: 'ubuntu-22.04'
     timeoutInMinutes: 180
     steps:
+      - checkout: self
+        fetchDepth: 0
       - task: Bash@3
         displayName: Build timestamp for caching
         continueOnError: true

diff --git a/ci/azure/azure-gcc-7-ubuntu-mpich.yml b/ci/azure/azure-gcc-7-ubuntu-mpich.yml
@@ -74,6 +74,8 @@ stages:
       vmImage: 'ubuntu-22.04'
     timeoutInMinutes: 180
     steps:
+      - checkout: self
+        fetchDepth: 0
       - task: Bash@3
         displayName: Build timestamp for caching
         continueOnError: true

diff --git a/ci/azure/azure-gcc-8-ubuntu-mpich.yml b/ci/azure/azure-gcc-8-ubuntu-mpich.yml
@@ -74,6 +74,8 @@ stages:
       vmImage: 'ubuntu-22.04'
     timeoutInMinutes: 180
     steps:
+      - checkout: self
+        fetchDepth: 0
       - task: Bash@3
         displayName: Build timestamp for caching
         continueOnError: true

diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml
@@ -74,6 +74,8 @@ stages:
       vmImage: 'ubuntu-22.04'
     timeoutInMinutes: 180
     steps:
+      - checkout: self
+        fetchDepth: 0
       - task: Bash@3
         displayName: Build timestamp for caching
         continueOnError: true

diff --git a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml
@@ -74,6 +74,8 @@ stages:
       vmImage: 'ubuntu-22.04'
     timeoutInMinutes: 180
     steps:
+      - checkout: self
+        fetchDepth: 0
       - task: Bash@3
         displayName: Build timestamp for caching
         continueOnError: true

diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml
@@ -74,6 +74,8 @@ stages:
       vmImage: 'ubuntu-22.04'
     timeoutInMinutes: 180
     steps:
+      - checkout: self
+        fetchDepth: 0
       - task: Bash@3
         displayName: Build timestamp for caching
         continueOnError: true

diff --git a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml
@@ -74,6 +74,8 @@ stages:
       vmImage: 'ubuntu-22.04'
     timeoutInMinutes: 180
     steps:
+      - checkout: self
+        fetchDepth: 0
       - task: Bash@3
         displayName: Build timestamp for caching
         continueOnError: true

diff --git a/ci/azure/azure-nvidia-11-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-ubuntu-mpich.yml
@@ -74,6 +74,8 @@ stages:
       vmImage: 'ubuntu-22.04'
     timeoutInMinutes: 180
     steps:
+      - checkout: self
+        fetchDepth: 0
       - task: Bash@3
         displayName: Build timestamp for caching
         continueOnError: true

diff --git a/ci/docker/ubuntu-18.04-gnu-docs.dockerfile b/ci/docker/ubuntu-18.04-gnu-docs.dockerfile
@@ -39,7 +39,7 @@ ENV MPI_EXTRA_FLAGS="" \
     PATH=/usr/lib/ccache/:$PATH
 
 COPY ./ci/deps/cmake.sh cmake.sh
-RUN ./cmake.sh 3.18.4
+RUN ./cmake.sh 3.23.4
 
 ENV PATH=/cmake/bin/:$PATH
 

diff --git a/ci/docker/ubuntu-20.04-gnu-openmpi-cpp.dockerfile b/ci/docker/ubuntu-20.04-gnu-openmpi-cpp.dockerfile
@@ -52,7 +52,7 @@ ENV CC=gcc \
     CXX=g++
 
 COPY ./ci/deps/cmake.sh cmake.sh
-RUN ./cmake.sh 3.18.4
+RUN ./cmake.sh 3.23.4
 
 ENV PATH=/cmake/bin/:$PATH
 ENV LESSCHARSET=utf-8

diff --git a/ci/docker/ubuntu-clang-cpp.dockerfile b/ci/docker/ubuntu-clang-cpp.dockerfile
@@ -44,7 +44,7 @@ COPY ./ci/deps/libunwind.sh libunwind.sh
 RUN ./libunwind.sh 1.6.2
 
 COPY ./ci/deps/cmake.sh cmake.sh
-RUN ./cmake.sh 3.18.4
+RUN ./cmake.sh 3.23.4
 
 ENV PATH=/cmake/bin/:$PATH
 ENV LESSCHARSET=utf-8

diff --git a/ci/docker/ubuntu-gnu-cpp.dockerfile b/ci/docker/ubuntu-gnu-cpp.dockerfile
@@ -57,7 +57,7 @@ ENV CC=gcc \
     CXX=g++
 
 COPY ./ci/deps/cmake.sh cmake.sh
-RUN ./cmake.sh 3.18.4
+RUN ./cmake.sh 3.23.4
 
 ENV PATH=/cmake/bin/:$PATH
 ENV LESSCHARSET=utf-8

diff --git a/ci/docker/ubuntu-nvidia-cpp.dockerfile b/ci/docker/ubuntu-nvidia-cpp.dockerfile
@@ -35,7 +35,7 @@ ENV CC=gcc \
     CXX=g++
 
 COPY ./ci/deps/cmake.sh cmake.sh
-RUN ./cmake.sh 3.18.4
+RUN ./cmake.sh 3.23.4
 
 ENV PATH=/cmake/bin/:$PATH
 ENV LESSCHARSET=utf-8

diff --git a/scripts/check_containers.sh b/scripts/check_containers.sh
@@ -1,11 +1,14 @@
 #!/usr/bin/env bash
-# Check if there were any dockerfiles modified in the latest pull request.
-# Note: this is specific to the way Azure checks out git repo.
+# Check if there were any dockerfiles modified in the PR.
+# Note: this is specific to Azure - in the pipeline's local branch git history
+# contains one merge commit for all of the changes in the PR.
 
 diff_latest() {
-  git diff --name-only "$(git log --skip=1 -1 --merges --pretty=format:%H)"..
+  printf "Files modified in the pull request:\n" >&2
+  git diff --name-only HEAD^1 HEAD | tee >(cat >&2)
 }
 
+# Decide which docker-compose command to use:
 if diff_latest | grep -i dockerfile > /dev/null
 then
     echo "build --pull"

diff --git a/scripts/workflow-azure-template.yml b/scripts/workflow-azure-template.yml
@@ -62,6 +62,8 @@ stages:
       [% workflow_runs_on %]
     timeoutInMinutes: 180
     steps:
+      - checkout: self
+        fetchDepth: 0
       - task: Bash@3
         displayName: Build timestamp for caching
         continueOnError: true