Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#363: Bump version to 1.5.0 ahead of release #364

Merged
merged 6 commits into from
Sep 19, 2024
Merged

#363: Bump version to 1.5.0 ahead of release #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cabc87a
#363: update version number
cwschilly Sep 17, 2024
ae4532f
#363: update library name in license
cwschilly Sep 17, 2024
c981ef0
#363: update all licenses to use magistrate instead of checkpoint
cwschilly Sep 17, 2024
f34cde6
#363: fix check_guards.sh script to run on entire repo
cwschilly Sep 17, 2024
33b5a21
#363: try docker compose instead of docker-compose
cwschilly Sep 18, 2024
e9d7212
#363: complete transition from docker-compose to docker compose
cwschilly Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-docs.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion examples/checkpoint_example_polymorphic_macro_nonintrusive.cc
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
lifflander marked this conversation as resolved.
Show resolved Hide resolved
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