From 845889a5001da64015b1459480f06ea64d369495 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Sat, 6 Jul 2024 14:06:55 +0200 Subject: [PATCH 1/5] #2312: Update docker compose command --- .github/workflows/build-docs.yml | 2 +- ci/azure/azure-clang-10-ubuntu-mpich.yml | 6 +++--- ci/azure/azure-clang-11-ubuntu-mpich.yml | 6 +++--- ci/azure/azure-clang-12-ubuntu-mpich.yml | 6 +++--- ci/azure/azure-clang-13-ubuntu-mpich.yml | 6 +++--- ci/azure/azure-clang-14-ubuntu-mpich.yml | 6 +++--- ci/azure/azure-clang-9-ubuntu-mpich.yml | 6 +++--- ci/azure/azure-clang-alpine-mpich.yml | 6 +++--- ci/azure/azure-gcc-10-ubuntu-openmpi.yml | 6 +++--- ci/azure/azure-gcc-11-ubuntu-mpich.yml | 6 +++--- ci/azure/azure-gcc-12-ubuntu-mpich.yml | 6 +++--- ci/azure/azure-gcc-8-ubuntu-mpich.yml | 6 +++--- ci/azure/azure-gcc-9-ubuntu-mpich.yml | 6 +++--- .../azure-intel-oneapi-icpc-ubuntu-mpich.yml | 6 +++--- .../azure-intel-oneapi-icpx-ubuntu-mpich.yml | 6 +++--- ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml | 6 +++--- ci/azure/azure-nvidia-12-ubuntu-mpich.yml | 6 +++--- docker-compose.yml | 16 ++++++++-------- docs/md/building.md | 16 ++++++++-------- scripts/check_containers.sh | 2 +- scripts/workflow-azure-template.yml | 6 +++--- 21 files changed, 69 insertions(+), 69 deletions(-) diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index e71dadc99b..6b71e33d59 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -32,4 +32,4 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build the Docker image - run: docker-compose run ubuntu-docs + run: docker compose run ubuntu-docs diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml index c7ac31d435..afaa623f4f 100644 --- a/ci/azure/azure-clang-10-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-10-ubuntu-mpich.yml @@ -131,14 +131,14 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Pull container inputs: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Build container inputs: containerregistrytype: 'Container Registry' @@ -166,7 +166,7 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Push container to registry continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml index efdf9d0d0c..9dec360ff9 100644 --- a/ci/azure/azure-clang-11-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-11-ubuntu-mpich.yml @@ -131,14 +131,14 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Pull container inputs: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Build container inputs: containerregistrytype: 'Container Registry' @@ -166,7 +166,7 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Push container to registry continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) diff --git a/ci/azure/azure-clang-12-ubuntu-mpich.yml b/ci/azure/azure-clang-12-ubuntu-mpich.yml index 8e0a9953c1..4a9505f751 100644 --- a/ci/azure/azure-clang-12-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-12-ubuntu-mpich.yml @@ -131,14 +131,14 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Pull container inputs: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Build container inputs: containerregistrytype: 'Container Registry' @@ -166,7 +166,7 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Push container to registry continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) diff --git a/ci/azure/azure-clang-13-ubuntu-mpich.yml b/ci/azure/azure-clang-13-ubuntu-mpich.yml index 93d412e21f..dded3e6023 100644 --- a/ci/azure/azure-clang-13-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-13-ubuntu-mpich.yml @@ -131,14 +131,14 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Pull container inputs: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Build container inputs: containerregistrytype: 'Container Registry' @@ -166,7 +166,7 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Push container to registry continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml index aa8cca4c54..2b3409cc81 100644 --- a/ci/azure/azure-clang-14-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-14-ubuntu-mpich.yml @@ -131,14 +131,14 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Pull container inputs: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Build container inputs: containerregistrytype: 'Container Registry' @@ -166,7 +166,7 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Push container to registry continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) diff --git a/ci/azure/azure-clang-9-ubuntu-mpich.yml b/ci/azure/azure-clang-9-ubuntu-mpich.yml index f0356f37e0..f45c14f565 100644 --- a/ci/azure/azure-clang-9-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-9-ubuntu-mpich.yml @@ -131,14 +131,14 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Pull container inputs: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Build container inputs: containerregistrytype: 'Container Registry' @@ -166,7 +166,7 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Push container to registry continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) diff --git a/ci/azure/azure-clang-alpine-mpich.yml b/ci/azure/azure-clang-alpine-mpich.yml index f4aa24175c..be2b1450c6 100644 --- a/ci/azure/azure-clang-alpine-mpich.yml +++ b/ci/azure/azure-clang-alpine-mpich.yml @@ -131,14 +131,14 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Pull container inputs: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' dockerComposeCommand: '$(compose_command) alpine-cpp-clean' - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Build container inputs: containerregistrytype: 'Container Registry' @@ -166,7 +166,7 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Push container to registry continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml index 32b0501a21..bd4aec7f40 100644 --- a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml +++ b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml @@ -131,14 +131,14 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Pull container inputs: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean-openmpi' - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Build container inputs: containerregistrytype: 'Container Registry' @@ -166,7 +166,7 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Push container to registry continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml index a6b8341955..469321c66f 100644 --- a/ci/azure/azure-gcc-11-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-11-ubuntu-mpich.yml @@ -131,14 +131,14 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Pull container inputs: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean-noinstall' - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Build container inputs: containerregistrytype: 'Container Registry' @@ -166,7 +166,7 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Push container to registry continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml index 6fb14a5f68..7d5920b159 100644 --- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml @@ -131,14 +131,14 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Pull container inputs: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Build container inputs: containerregistrytype: 'Container Registry' @@ -166,7 +166,7 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Push container to registry continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) diff --git a/ci/azure/azure-gcc-8-ubuntu-mpich.yml b/ci/azure/azure-gcc-8-ubuntu-mpich.yml index c1fec3df01..e185deb525 100644 --- a/ci/azure/azure-gcc-8-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-8-ubuntu-mpich.yml @@ -131,14 +131,14 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Pull container inputs: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Build container inputs: containerregistrytype: 'Container Registry' @@ -166,7 +166,7 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Push container to registry continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml index 4386004bc5..b8da0795d4 100644 --- a/ci/azure/azure-gcc-9-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-9-ubuntu-mpich.yml @@ -131,14 +131,14 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Pull container inputs: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Build container inputs: containerregistrytype: 'Container Registry' @@ -166,7 +166,7 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Push container to registry continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) diff --git a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml index 3d3673dcc2..823c1a47c3 100644 --- a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml @@ -131,14 +131,14 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Pull container inputs: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Build container inputs: containerregistrytype: 'Container Registry' @@ -166,7 +166,7 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Push container to registry continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml index 8c54d45a7d..419c50d735 100644 --- a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml @@ -131,14 +131,14 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Pull container inputs: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Build container inputs: containerregistrytype: 'Container Registry' @@ -166,7 +166,7 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Push container to registry continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) diff --git a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml index dd23034fa7..2070b6a47a 100644 --- a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml @@ -131,14 +131,14 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Pull container inputs: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Build container inputs: containerregistrytype: 'Container Registry' @@ -166,7 +166,7 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Push container to registry continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) diff --git a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml index 5f491f96af..c783da071d 100644 --- a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml @@ -131,14 +131,14 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Pull container inputs: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Build container inputs: containerregistrytype: 'Container Registry' @@ -166,7 +166,7 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Push container to registry continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) diff --git a/docker-compose.yml b/docker-compose.yml index 6ed7dbba12..529656dfe2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,15 +51,15 @@ # $ export COMPILER=icpx # $ export HOST_COMPILER=icpx # $ export VT_TRACE=1 -# $ docker-compose pull ubuntu-cpp-interactive -# $ docker-compose run ubuntu-cpp-interactive +# $ docker compose pull ubuntu-cpp-interactive +# $ docker compose run ubuntu-cpp-interactive # # /vt/ci/build_cpp.sh /vt /build # # For a non-interactive build with gcc-8, since gnu is the default compiler # type, one may do the following: # -# $ COMPILER=gcc-8 docker-compose pull ubuntu-cpp -# $ COMPILER=gcc-8 docker-compose run ubuntu-cpp +# $ COMPILER=gcc-8 docker compose pull ubuntu-cpp +# $ COMPILER=gcc-8 docker compose run ubuntu-cpp # # Need verision >= 3.5 for the features in use @@ -125,7 +125,7 @@ services: ############################################################################## # C++ builds of VT on ubuntu/alpine platform from container baseline # Ubuntu gcc-12 debug build: - # docker-compose run -e CMAKE_BUILD_TYPE=debug ubuntu-cpp + # docker compose run -e CMAKE_BUILD_TYPE=debug ubuntu-cpp ubuntu-cpp: image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp build: @@ -161,7 +161,7 @@ services: # baseline. # # Example: - # docker-compose run ubuntu-cpp-clean + # docker compose run ubuntu-cpp-clean ubuntu-cpp-clean: image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp build: @@ -187,7 +187,7 @@ services: # baseline without installing. # # Example: - # docker-compose run ubuntu-cpp-clean-noinstall + # docker compose run ubuntu-cpp-clean-noinstall ubuntu-cpp-clean-noinstall: image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp build: @@ -211,7 +211,7 @@ services: # Interactive C++ setup of VT on ubuntu platform from container baseline. # # After running: - # docker-compose run ubuntu-cpp-interactive + # docker compose run ubuntu-cpp-interactive # # You will get a command line where you can run the build command: # $ /vt/ci/build_cpp.sh /vt /build diff --git a/docs/md/building.md b/docs/md/building.md index e34db71dae..e86466d0e3 100644 --- a/docs/md/building.md +++ b/docs/md/building.md @@ -121,19 +121,19 @@ $ VT_TRACE_ENABLED=1 CMAKE_BUILD_TYPE=Debug /usr/src/vt/ci/build_cpp.sh /usr/src The easiest way to build *vt* is by using `docker` with the available containers that contain the proper compilers, MPI, and all other dependencies. First, -install `docker` on the system. On some systems, `docker-compose` might also +install `docker` on the system. On some systems, `docker compose` might also need to be installed. -The `docker` builds are configured through `docker-compose` to use a shared, +The `docker` builds are configured through `docker compose` to use a shared, cached filesystem mount with the host for `ccache` to enable fast re-builds. -For `docker-compose`, the following variables can be set to configure the +For `docker compose`, the following variables can be set to configure the build. One may configure the architecture, compiler type (GNU, Clang, Intel, Nvidia) and compiler version, Linux distro (ubuntu or alpine), and distro version. The default set of the docker configuration options is located in `vt/.env`, -which `docker-compose` will read. +which `docker compose` will read. ``` # Variables: @@ -171,18 +171,18 @@ which `docker-compose` will read. With these set, one may run the following for a non-interactive build with ubuntu. Or, to speed up the build process, the base container can be pulled for -many of the common configurations: `docker-compose pull ubuntu-cpp`. +many of the common configurations: `docker compose pull ubuntu-cpp`. ```bash $ cd vt -$ docker-compose run -e BUILD_TYPE=debug -e VT_TRACE=1 ubuntu-cpp +$ docker compose run -e BUILD_TYPE=debug -e VT_TRACE=1 ubuntu-cpp ``` Or, alternatively, run a non-interactive build with alpine: ```bash $ cd vt -$ docker-compose run -e BUILD_TYPE=debug -e VT_TRACE=1 alpine-cpp +$ docker compose run -e BUILD_TYPE=debug -e VT_TRACE=1 alpine-cpp ``` For an interactive build with ubuntu, where one can build, debug, and run @@ -190,7 +190,7 @@ For an interactive build with ubuntu, where one can build, debug, and run ```bash $ cd vt -$ docker-compose run -e BUILD_TYPE=debug -e VT_TRACE=1 ubuntu-cpp-interactive +$ docker compose run -e BUILD_TYPE=debug -e VT_TRACE=1 ubuntu-cpp-interactive # /vt/ci/build_cpp.sh /vt /build # /vt/ci/test_cpp.sh /vt /build # /vt/ci/build_vt_sample.sh /vt /build diff --git a/scripts/check_containers.sh b/scripts/check_containers.sh index 87e89121b6..2cf7da8f76 100755 --- a/scripts/check_containers.sh +++ b/scripts/check_containers.sh @@ -8,7 +8,7 @@ diff_latest() { git diff --name-only HEAD^1 HEAD | tee >(cat >&2) } -# Decide which docker-compose command to use: +# 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 index 78ada35e6f..808686e0d5 100644 --- a/scripts/workflow-azure-template.yml +++ b/scripts/workflow-azure-template.yml @@ -119,14 +119,14 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Pull container inputs: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' dockerComposeCommand: '$(compose_command) [% docker_target %]' - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Build container inputs: containerregistrytype: 'Container Registry' @@ -154,7 +154,7 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Push container to registry continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) From fd2c7a1e0b7616ab4ee34a8b8c6b5f2c32da8240 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Sat, 6 Jul 2024 14:14:49 +0200 Subject: [PATCH 2/5] #2312: Specify project name to avoid CI failure caused by Azure migrations --- ci/azure/azure-clang-10-ubuntu-mpich.yml | 3 +++ ci/azure/azure-clang-11-ubuntu-mpich.yml | 3 +++ ci/azure/azure-clang-12-ubuntu-mpich.yml | 3 +++ ci/azure/azure-clang-13-ubuntu-mpich.yml | 3 +++ ci/azure/azure-clang-14-ubuntu-mpich.yml | 3 +++ ci/azure/azure-clang-9-ubuntu-mpich.yml | 3 +++ ci/azure/azure-clang-alpine-mpich.yml | 3 +++ ci/azure/azure-gcc-10-ubuntu-openmpi.yml | 3 +++ ci/azure/azure-gcc-11-ubuntu-mpich.yml | 3 +++ ci/azure/azure-gcc-12-ubuntu-mpich.yml | 3 +++ ci/azure/azure-gcc-8-ubuntu-mpich.yml | 3 +++ ci/azure/azure-gcc-9-ubuntu-mpich.yml | 3 +++ ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml | 3 +++ ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml | 3 +++ ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml | 3 +++ ci/azure/azure-nvidia-12-ubuntu-mpich.yml | 3 +++ scripts/workflow-azure-template.yml | 3 +++ 17 files changed, 51 insertions(+) diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml index afaa623f4f..0f6b2cb65b 100644 --- a/ci/azure/azure-clang-10-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-10-ubuntu-mpich.yml @@ -134,6 +134,7 @@ stages: - task: DockerCompose@1 displayName: Pull container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -141,6 +142,7 @@ stages: - task: DockerCompose@1 displayName: Build container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -171,6 +173,7 @@ stages: continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'dockerRegistryConnection1' dockerComposeFile: '**/docker-compose.yml' diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml index 9dec360ff9..281a162626 100644 --- a/ci/azure/azure-clang-11-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-11-ubuntu-mpich.yml @@ -134,6 +134,7 @@ stages: - task: DockerCompose@1 displayName: Pull container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -141,6 +142,7 @@ stages: - task: DockerCompose@1 displayName: Build container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -171,6 +173,7 @@ stages: continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'dockerRegistryConnection1' dockerComposeFile: '**/docker-compose.yml' diff --git a/ci/azure/azure-clang-12-ubuntu-mpich.yml b/ci/azure/azure-clang-12-ubuntu-mpich.yml index 4a9505f751..8139910e3e 100644 --- a/ci/azure/azure-clang-12-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-12-ubuntu-mpich.yml @@ -134,6 +134,7 @@ stages: - task: DockerCompose@1 displayName: Pull container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -141,6 +142,7 @@ stages: - task: DockerCompose@1 displayName: Build container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -171,6 +173,7 @@ stages: continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'dockerRegistryConnection1' dockerComposeFile: '**/docker-compose.yml' diff --git a/ci/azure/azure-clang-13-ubuntu-mpich.yml b/ci/azure/azure-clang-13-ubuntu-mpich.yml index dded3e6023..73619bf76c 100644 --- a/ci/azure/azure-clang-13-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-13-ubuntu-mpich.yml @@ -134,6 +134,7 @@ stages: - task: DockerCompose@1 displayName: Pull container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -141,6 +142,7 @@ stages: - task: DockerCompose@1 displayName: Build container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -171,6 +173,7 @@ stages: continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'dockerRegistryConnection1' dockerComposeFile: '**/docker-compose.yml' diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml index 2b3409cc81..84015c9de0 100644 --- a/ci/azure/azure-clang-14-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-14-ubuntu-mpich.yml @@ -134,6 +134,7 @@ stages: - task: DockerCompose@1 displayName: Pull container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -141,6 +142,7 @@ stages: - task: DockerCompose@1 displayName: Build container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -171,6 +173,7 @@ stages: continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'dockerRegistryConnection1' dockerComposeFile: '**/docker-compose.yml' diff --git a/ci/azure/azure-clang-9-ubuntu-mpich.yml b/ci/azure/azure-clang-9-ubuntu-mpich.yml index f45c14f565..f610c3880c 100644 --- a/ci/azure/azure-clang-9-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-9-ubuntu-mpich.yml @@ -134,6 +134,7 @@ stages: - task: DockerCompose@1 displayName: Pull container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -141,6 +142,7 @@ stages: - task: DockerCompose@1 displayName: Build container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -171,6 +173,7 @@ stages: continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'dockerRegistryConnection1' dockerComposeFile: '**/docker-compose.yml' diff --git a/ci/azure/azure-clang-alpine-mpich.yml b/ci/azure/azure-clang-alpine-mpich.yml index be2b1450c6..3c41ba56e2 100644 --- a/ci/azure/azure-clang-alpine-mpich.yml +++ b/ci/azure/azure-clang-alpine-mpich.yml @@ -134,6 +134,7 @@ stages: - task: DockerCompose@1 displayName: Pull container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -141,6 +142,7 @@ stages: - task: DockerCompose@1 displayName: Build container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -171,6 +173,7 @@ stages: continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'dockerRegistryConnection1' dockerComposeFile: '**/docker-compose.yml' diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml index bd4aec7f40..62cea11228 100644 --- a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml +++ b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml @@ -134,6 +134,7 @@ stages: - task: DockerCompose@1 displayName: Pull container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -141,6 +142,7 @@ stages: - task: DockerCompose@1 displayName: Build container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -171,6 +173,7 @@ stages: continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'dockerRegistryConnection1' dockerComposeFile: '**/docker-compose.yml' diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml index 469321c66f..7805b1f6c0 100644 --- a/ci/azure/azure-gcc-11-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-11-ubuntu-mpich.yml @@ -134,6 +134,7 @@ stages: - task: DockerCompose@1 displayName: Pull container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -141,6 +142,7 @@ stages: - task: DockerCompose@1 displayName: Build container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -171,6 +173,7 @@ stages: continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'dockerRegistryConnection1' dockerComposeFile: '**/docker-compose.yml' diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml index 7d5920b159..35be998973 100644 --- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml @@ -134,6 +134,7 @@ stages: - task: DockerCompose@1 displayName: Pull container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -141,6 +142,7 @@ stages: - task: DockerCompose@1 displayName: Build container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -171,6 +173,7 @@ stages: continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'dockerRegistryConnection1' dockerComposeFile: '**/docker-compose.yml' diff --git a/ci/azure/azure-gcc-8-ubuntu-mpich.yml b/ci/azure/azure-gcc-8-ubuntu-mpich.yml index e185deb525..b286ab0bc5 100644 --- a/ci/azure/azure-gcc-8-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-8-ubuntu-mpich.yml @@ -134,6 +134,7 @@ stages: - task: DockerCompose@1 displayName: Pull container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -141,6 +142,7 @@ stages: - task: DockerCompose@1 displayName: Build container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -171,6 +173,7 @@ stages: continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'dockerRegistryConnection1' dockerComposeFile: '**/docker-compose.yml' diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml index b8da0795d4..358d8f9047 100644 --- a/ci/azure/azure-gcc-9-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-9-ubuntu-mpich.yml @@ -134,6 +134,7 @@ stages: - task: DockerCompose@1 displayName: Pull container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -141,6 +142,7 @@ stages: - task: DockerCompose@1 displayName: Build container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -171,6 +173,7 @@ stages: continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'dockerRegistryConnection1' dockerComposeFile: '**/docker-compose.yml' diff --git a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml index 823c1a47c3..d60306c4ae 100644 --- a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml @@ -134,6 +134,7 @@ stages: - task: DockerCompose@1 displayName: Pull container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -141,6 +142,7 @@ stages: - task: DockerCompose@1 displayName: Build container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -171,6 +173,7 @@ stages: continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'dockerRegistryConnection1' dockerComposeFile: '**/docker-compose.yml' diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml index 419c50d735..ceac87ff31 100644 --- a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml @@ -134,6 +134,7 @@ stages: - task: DockerCompose@1 displayName: Pull container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -141,6 +142,7 @@ stages: - task: DockerCompose@1 displayName: Build container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -171,6 +173,7 @@ stages: continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'dockerRegistryConnection1' dockerComposeFile: '**/docker-compose.yml' diff --git a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml index 2070b6a47a..e30c8760f1 100644 --- a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml @@ -134,6 +134,7 @@ stages: - task: DockerCompose@1 displayName: Pull container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -141,6 +142,7 @@ stages: - task: DockerCompose@1 displayName: Build container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -171,6 +173,7 @@ stages: continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'dockerRegistryConnection1' dockerComposeFile: '**/docker-compose.yml' diff --git a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml index c783da071d..5a19ca429d 100644 --- a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml @@ -134,6 +134,7 @@ stages: - task: DockerCompose@1 displayName: Pull container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -141,6 +142,7 @@ stages: - task: DockerCompose@1 displayName: Build container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -171,6 +173,7 @@ stages: continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'dockerRegistryConnection1' dockerComposeFile: '**/docker-compose.yml' diff --git a/scripts/workflow-azure-template.yml b/scripts/workflow-azure-template.yml index 808686e0d5..6cd0c9f447 100644 --- a/scripts/workflow-azure-template.yml +++ b/scripts/workflow-azure-template.yml @@ -122,6 +122,7 @@ stages: - task: DockerCompose@1 displayName: Pull container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -129,6 +130,7 @@ stages: - task: DockerCompose@1 displayName: Build container inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' @@ -159,6 +161,7 @@ stages: continueOnError: true condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) inputs: + projectName: darma-tasking-vt containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'dockerRegistryConnection1' dockerComposeFile: '**/docker-compose.yml' From 4d1eb63743ef295fa397f8b8c65e0261ee451617 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Sat, 6 Jul 2024 14:28:49 +0200 Subject: [PATCH 3/5] #2312: Update GitHub actions to the newest versions --- .github/workflows/build-docs.yml | 2 +- .github/workflows/build-statistics.yml | 2 +- .github/workflows/check-commit-format.yml | 2 +- .github/workflows/check-include-guards-and-license.yml | 4 ++-- .github/workflows/check-trailing-whitespace.yml | 2 +- .github/workflows/macosx-clang-mpich.yml | 2 +- .github/workflows/pushdockerimage.yml | 2 +- .github/workflows/run-git-check.yml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index 6b71e33d59..7a73fd7950 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -30,6 +30,6 @@ jobs: TOKEN: ${{ secrets.GH_PAT }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build the Docker image run: docker compose run ubuntu-docs diff --git a/.github/workflows/build-statistics.yml b/.github/workflows/build-statistics.yml index 5e46197c7c..445785129f 100644 --- a/.github/workflows/build-statistics.yml +++ b/.github/workflows/build-statistics.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Generate build stats uses: DARMA-tasking/build-stats@master diff --git a/.github/workflows/check-commit-format.yml b/.github/workflows/check-commit-format.yml index 2fe7393712..20843d7694 100644 --- a/.github/workflows/check-commit-format.yml +++ b/.github/workflows/check-commit-format.yml @@ -7,7 +7,7 @@ jobs: name: Check commit runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 ref: ${{ github.event.pull_request.head.sha }} diff --git a/.github/workflows/check-include-guards-and-license.yml b/.github/workflows/check-include-guards-and-license.yml index 22c3d24855..5dbe48f9f0 100644 --- a/.github/workflows/check-include-guards-and-license.yml +++ b/.github/workflows/check-include-guards-and-license.yml @@ -8,10 +8,10 @@ jobs: steps: - name: Checkout source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Dependencies - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: '3.7' diff --git a/.github/workflows/check-trailing-whitespace.yml b/.github/workflows/check-trailing-whitespace.yml index d7c287528d..9e003b15a7 100644 --- a/.github/workflows/check-trailing-whitespace.yml +++ b/.github/workflows/check-trailing-whitespace.yml @@ -7,7 +7,7 @@ jobs: name: Find Trailing Whitespace runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: DARMA-tasking/find-trailing-whitespace@master with: exclude: "sketches;lib" diff --git a/.github/workflows/macosx-clang-mpich.yml b/.github/workflows/macosx-clang-mpich.yml index 9f640a9127..e2fc998e68 100644 --- a/.github/workflows/macosx-clang-mpich.yml +++ b/.github/workflows/macosx-clang-mpich.yml @@ -32,7 +32,7 @@ jobs: CMAKE_BUILD_PARALLEL_LEVEL: 4 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/cache@v3 with: path: ~/.ccache diff --git a/.github/workflows/pushdockerimage.yml b/.github/workflows/pushdockerimage.yml index 0fd24234c6..ffe988e457 100644 --- a/.github/workflows/pushdockerimage.yml +++ b/.github/workflows/pushdockerimage.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Docker Build & Push uses: jerray/publish-docker-action@master with: diff --git a/.github/workflows/run-git-check.yml b/.github/workflows/run-git-check.yml index 714cbb82b9..60eb90df58 100644 --- a/.github/workflows/run-git-check.yml +++ b/.github/workflows/run-git-check.yml @@ -7,7 +7,7 @@ jobs: name: Run git check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 ref: ${{ github.event.pull_request.head.sha }} From 0bcb765c0e2496b04a4d204fb80d2a5c76c83dd4 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Sat, 6 Jul 2024 16:50:07 +0200 Subject: [PATCH 4/5] #2312: Remove version parameter from docker-compose.yml --- docker-compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 529656dfe2..77fee64a9f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -62,9 +62,6 @@ # $ COMPILER=gcc-8 docker compose run ubuntu-cpp # -# Need verision >= 3.5 for the features in use -version: '3.8' - # Volume will be created automatically for each combination of parameters. volumes: ubuntu-cpp: From 4a695efc6d6bc7c702687966a5730b933a1794b3 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Tue, 9 Jul 2024 19:22:52 +0200 Subject: [PATCH 5/5] #2312: Update actions/cache version to v4 --- .github/workflows/macosx-clang-mpich.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macosx-clang-mpich.yml b/.github/workflows/macosx-clang-mpich.yml index e2fc998e68..b30e82c0c7 100644 --- a/.github/workflows/macosx-clang-mpich.yml +++ b/.github/workflows/macosx-clang-mpich.yml @@ -33,13 +33,13 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/.ccache key: ${{ runner.os }}-macosx-clang-14-ccache-${{ secrets.GH_ACTIONS_CACHE_VERSION }}-${{ hashFiles('**/*') }} restore-keys: | ${{ runner.os }}-macosx-clang-14-ccache-${{ secrets.GH_ACTIONS_CACHE_VERSION }} - - uses: actions/cache@v3 + - uses: actions/cache@v4 id: mpich-cache with: path: ~/.mpich