Skip to content

Commit

Permalink
Merge pull request #364 from DARMA-tasking/363-bump-version-to-150-ah…
Browse files Browse the repository at this point in the history
…ead-of-release

#363: Bump version to 1.5.0 ahead of release
  • Loading branch information
lifflander authored Sep 19, 2024
2 parents 1eba7cc + e9d7212 commit 3d60dd6
Show file tree
Hide file tree
Showing 159 changed files with 414 additions and 417 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Build the Docker image
run: docker-compose run ubuntu-docs
run: docker compose run ubuntu-docs
4 changes: 2 additions & 2 deletions .github/workflows/dockerimage-clang-10-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
shell: bash
run: $(./scripts/check_containers.sh) ubuntu-cpp
- name: Build the Docker image
run: docker-compose run ubuntu-cpp
run: docker compose run ubuntu-cpp
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
- name: Docker Push Base Image
Expand All @@ -68,7 +68,7 @@ jobs:
run: |
docker login -u ${{ secrets.DOCKER_USERNAME }} \
-p ${{ secrets.DOCKER_PASSWORD }}
docker-compose push ubuntu-cpp
docker compose push ubuntu-cpp
- name: Zip up CMake output
run: |
zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dockerimage-clang-11-ubuntu-mpich-vt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
shell: bash
run: $(./scripts/check_containers.sh) ubuntu-cpp-vt
- name: Build the Docker image
run: docker-compose run ubuntu-cpp-vt
run: docker compose run ubuntu-cpp-vt
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
- name: Docker Push Base Image
Expand All @@ -68,4 +68,4 @@ jobs:
run: |
docker login -u ${{ secrets.DOCKER_USERNAME }} \
-p ${{ secrets.DOCKER_PASSWORD }}
docker-compose push ubuntu-cpp-vt
docker compose push ubuntu-cpp-vt
4 changes: 2 additions & 2 deletions .github/workflows/dockerimage-clang-11-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
shell: bash
run: $(./scripts/check_containers.sh) ubuntu-cpp
- name: Build the Docker image
run: docker-compose run ubuntu-cpp
run: docker compose run ubuntu-cpp
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
- name: Docker Push Base Image
Expand All @@ -68,7 +68,7 @@ jobs:
run: |
docker login -u ${{ secrets.DOCKER_USERNAME }} \
-p ${{ secrets.DOCKER_PASSWORD }}
docker-compose push ubuntu-cpp
docker compose push ubuntu-cpp
- name: Zip up CMake output
run: |
zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dockerimage-clang-12-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
shell: bash
run: $(./scripts/check_containers.sh) ubuntu-cpp
- name: Build the Docker image
run: docker-compose run ubuntu-cpp
run: docker compose run ubuntu-cpp
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
- name: Docker Push Base Image
Expand All @@ -68,7 +68,7 @@ jobs:
run: |
docker login -u ${{ secrets.DOCKER_USERNAME }} \
-p ${{ secrets.DOCKER_PASSWORD }}
docker-compose push ubuntu-cpp
docker compose push ubuntu-cpp
- name: Zip up CMake output
run: |
zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dockerimage-clang-13-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
shell: bash
run: $(./scripts/check_containers.sh) ubuntu-cpp
- name: Build the Docker image
run: docker-compose run ubuntu-cpp
run: docker compose run ubuntu-cpp
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
- name: Docker Push Base Image
Expand All @@ -68,7 +68,7 @@ jobs:
run: |
docker login -u ${{ secrets.DOCKER_USERNAME }} \
-p ${{ secrets.DOCKER_PASSWORD }}
docker-compose push ubuntu-cpp
docker compose push ubuntu-cpp
- name: Zip up CMake output
run: |
zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dockerimage-clang-14-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
shell: bash
run: $(./scripts/check_containers.sh) ubuntu-cpp
- name: Build the Docker image
run: docker-compose run ubuntu-cpp
run: docker compose run ubuntu-cpp
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
- name: Docker Push Base Image
Expand All @@ -68,7 +68,7 @@ jobs:
run: |
docker login -u ${{ secrets.DOCKER_USERNAME }} \
-p ${{ secrets.DOCKER_PASSWORD }}
docker-compose push ubuntu-cpp
docker compose push ubuntu-cpp
- name: Zip up CMake output
run: |
zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dockerimage-clang-8-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
shell: bash
run: $(./scripts/check_containers.sh) ubuntu-cpp
- name: Build the Docker image
run: docker-compose run ubuntu-cpp
run: docker compose run ubuntu-cpp
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
- name: Docker Push Base Image
Expand All @@ -68,7 +68,7 @@ jobs:
run: |
docker login -u ${{ secrets.DOCKER_USERNAME }} \
-p ${{ secrets.DOCKER_PASSWORD }}
docker-compose push ubuntu-cpp
docker compose push ubuntu-cpp
- name: Zip up CMake output
run: |
zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dockerimage-clang-9-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
shell: bash
run: $(./scripts/check_containers.sh) ubuntu-cpp
- name: Build the Docker image
run: docker-compose run ubuntu-cpp
run: docker compose run ubuntu-cpp
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
- name: Docker Push Base Image
Expand All @@ -68,7 +68,7 @@ jobs:
run: |
docker login -u ${{ secrets.DOCKER_USERNAME }} \
-p ${{ secrets.DOCKER_PASSWORD }}
docker-compose push ubuntu-cpp
docker compose push ubuntu-cpp
- name: Zip up CMake output
run: |
zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dockerimage-gcc-10-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
shell: bash
run: $(./scripts/check_containers.sh) ubuntu-cpp
- name: Build the Docker image
run: docker-compose run ubuntu-cpp
run: docker compose run ubuntu-cpp
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
- name: Docker Push Base Image
Expand All @@ -68,7 +68,7 @@ jobs:
run: |
docker login -u ${{ secrets.DOCKER_USERNAME }} \
-p ${{ secrets.DOCKER_PASSWORD }}
docker-compose push ubuntu-cpp
docker compose push ubuntu-cpp
- name: Zip up CMake output
run: |
zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
shell: bash
run: $(./scripts/check_containers.sh) ubuntu-cpp
- name: Build the Docker image
run: docker-compose run ubuntu-cpp
run: docker compose run ubuntu-cpp
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
- name: Docker Push Base Image
Expand All @@ -68,7 +68,7 @@ jobs:
run: |
docker login -u ${{ secrets.DOCKER_USERNAME }} \
-p ${{ secrets.DOCKER_PASSWORD }}
docker-compose push ubuntu-cpp
docker compose push ubuntu-cpp
- name: Zip up CMake output
run: |
zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
shell: bash
run: $(./scripts/check_containers.sh) ubuntu-cpp
- name: Build the Docker image
run: docker-compose run ubuntu-cpp
run: docker compose run ubuntu-cpp
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
- name: Docker Push Base Image
Expand All @@ -68,7 +68,7 @@ jobs:
run: |
docker login -u ${{ secrets.DOCKER_USERNAME }} \
-p ${{ secrets.DOCKER_PASSWORD }}
docker-compose push ubuntu-cpp
docker compose push ubuntu-cpp
- name: Zip up CMake output
run: |
zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dockerimage-nvcc-11-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
shell: bash
run: $(./scripts/check_containers.sh) ubuntu-cpp
- name: Build the Docker image
run: docker-compose run ubuntu-cpp
run: docker compose run ubuntu-cpp
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
- name: Docker Push Base Image
Expand All @@ -68,7 +68,7 @@ jobs:
run: |
docker login -u ${{ secrets.DOCKER_USERNAME }} \
-p ${{ secrets.DOCKER_PASSWORD }}
docker-compose push ubuntu-cpp
docker compose push ubuntu-cpp
- name: Zip up CMake output
run: |
zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.23)
project(magistrate VERSION 1.4.0)
project(magistrate VERSION 1.5.0)

include(cmake/turn_on_warnings.cmake)

Expand Down
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DARMA Toolkit v. 1.0.0
DARMA/checkpoint => Serialization Library
DARMA Toolkit v. 1.5.0
DARMA/magistrate => Serialization Library
For version number see VERSION file

Copyright 2019 National Technology & Engineering Solutions of Sandia, LLC
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.4.0
1.5.0
2 changes: 1 addition & 1 deletion examples/checkpoint_example_1.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// *****************************************************************************
//
// checkpoint_example_1.cc
// DARMA/checkpoint => Serialization Library
// DARMA/magistrate => Serialization Library
//
// Copyright 2019 National Technology & Engineering Solutions of Sandia, LLC
// (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
Expand Down
2 changes: 1 addition & 1 deletion examples/checkpoint_example_1_nonintrusive.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// *****************************************************************************
//
// checkpoint_example_1_nonintrusive.cc
// DARMA/checkpoint => Serialization Library
// DARMA/magistrate => Serialization Library
//
// Copyright 2019 National Technology & Engineering Solutions of Sandia, LLC
// (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
Expand Down
2 changes: 1 addition & 1 deletion examples/checkpoint_example_2.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// *****************************************************************************
//
// checkpoint_example_2.cc
// DARMA/checkpoint => Serialization Library
// DARMA/magistrate => Serialization Library
//
// Copyright 2019 National Technology & Engineering Solutions of Sandia, LLC
// (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
Expand Down
2 changes: 1 addition & 1 deletion examples/checkpoint_example_2_nonintrusive.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// *****************************************************************************
//
// checkpoint_example_2_nonintrusive.cc
// DARMA/checkpoint => Serialization Library
// DARMA/magistrate => Serialization Library
//
// Copyright 2019 National Technology & Engineering Solutions of Sandia, LLC
// (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
Expand Down
2 changes: 1 addition & 1 deletion examples/checkpoint_example_3.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// *****************************************************************************
//
// checkpoint_example_3.cc
// DARMA/checkpoint => Serialization Library
// DARMA/magistrate => Serialization Library
//
// Copyright 2019 National Technology & Engineering Solutions of Sandia, LLC
// (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
Expand Down
2 changes: 1 addition & 1 deletion examples/checkpoint_example_3_nonintrusive.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// *****************************************************************************
//
// checkpoint_example_3_nonintrusive.cc
// DARMA/checkpoint => Serialization Library
// DARMA/magistrate => Serialization Library
//
// Copyright 2019 National Technology & Engineering Solutions of Sandia, LLC
// (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
Expand Down
2 changes: 1 addition & 1 deletion examples/checkpoint_example_polymorphic.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// *****************************************************************************
//
// checkpoint_example_polymorphic.cc
// DARMA/checkpoint => Serialization Library
// DARMA/magistrate => Serialization Library
//
// Copyright 2019 National Technology & Engineering Solutions of Sandia, LLC
// (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
Expand Down
2 changes: 1 addition & 1 deletion examples/checkpoint_example_polymorphic_macro.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// *****************************************************************************
//
// checkpoint_example_polymorphic_macro.cc
// DARMA/checkpoint => Serialization Library
// DARMA/magistrate => Serialization Library
//
// Copyright 2019 National Technology & Engineering Solutions of Sandia, LLC
// (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// *****************************************************************************
//
// checkpoint_example_polymorphic_macro_nonintrusive.cc
// DARMA/checkpoint => Serialization Library
// DARMA/magistrate => Serialization Library
//
// Copyright 2019 National Technology & Engineering Solutions of Sandia, LLC
// (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
Expand Down
2 changes: 1 addition & 1 deletion examples/checkpoint_example_polymorphic_nonintrusive.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// *****************************************************************************
//
// checkpoint_example_polymorphic_nonintrusive.cc
// DARMA/checkpoint => Serialization Library
// DARMA/magistrate => Serialization Library
//
// Copyright 2019 National Technology & Engineering Solutions of Sandia, LLC
// (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
Expand Down
2 changes: 1 addition & 1 deletion examples/checkpoint_example_to_file.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// *****************************************************************************
//
// checkpoint_example_to_file.cc
// DARMA/checkpoint => Serialization Library
// DARMA/magistrate => Serialization Library
//
// Copyright 2019 National Technology & Engineering Solutions of Sandia, LLC
// (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
Expand Down
2 changes: 1 addition & 1 deletion examples/checkpoint_example_to_file_nonintrusive.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// *****************************************************************************
//
// checkpoint_example_to_file_nonintrusive.cc
// DARMA/checkpoint => Serialization Library
// DARMA/magistrate => Serialization Library
//
// Copyright 2019 National Technology & Engineering Solutions of Sandia, LLC
// (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
Expand Down
2 changes: 1 addition & 1 deletion examples/checkpoint_example_traversal.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// *****************************************************************************
//
// checkpoint_example_traversal.cc
// DARMA/checkpoint => Serialization Library
// DARMA/magistrate => Serialization Library
//
// Copyright 2019 National Technology & Engineering Solutions of Sandia, LLC
// (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
Expand Down
2 changes: 1 addition & 1 deletion examples/checkpoint_example_traversal_nonintrusive.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// *****************************************************************************
//
// checkpoint_example_traversal_nonintrusive.cc
// DARMA/checkpoint => Serialization Library
// DARMA/magistrate => Serialization Library
//
// Copyright 2019 National Technology & Engineering Solutions of Sandia, LLC
// (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
Expand Down
4 changes: 2 additions & 2 deletions scripts/check_containers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ diff_latest() {
# Print the modified files list to stderr as well.
if diff_latest | tee >(cat >&2) | grep -i -q dockerfile
then
echo "docker-compose build --pull"
echo "docker compose build --pull"
else
echo "docker-compose pull --ignore-pull-failures"
echo "docker compose pull --ignore-pull-failures"
fi
5 changes: 1 addition & 4 deletions scripts/check_guards.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ path_to_magistrate=${1}
show_fix_command=${2}
cd "$path_to_magistrate" || exit 1

for sub_dir in "src" "tests" "examples"
do
python3 "${path_to_magistrate}/scripts/generate_header_guards_and_license.py" -s=${sub_dir} -l="${path_to_magistrate}/scripts/license-template"
done
python3 "${path_to_magistrate}/scripts/generate_header_guards_and_license.py" -s="${path_to_magistrate}" -l="${path_to_magistrate}/scripts/license-template"

# Check for modified files
modified_files=$(git ls-files -m)
Expand Down
2 changes: 1 addition & 1 deletion scripts/license-template
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// *****************************************************************************
//
// <file-name>
// DARMA/checkpoint => Serialization Library
// DARMA/magistrate => Serialization Library
//
// Copyright 2019 National Technology & Engineering Solutions of Sandia, LLC
// (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
Expand Down
Loading

0 comments on commit 3d60dd6

Please sign in to comment.