Skip to content

Commit 7597134

Browse files
authored
Merge pull request #257 from LLNL/v2024.02.1-RC
V2024.02.1 RC merge to main
2 parents 4234114 + 3d339e2 commit 7597134

File tree

17 files changed

+28
-19
lines changed

17 files changed

+28
-19
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ stages:
7373
include:
7474
- local: '.gitlab/custom-jobs-and-variables.yml'
7575
- project: 'radiuss/radiuss-shared-ci'
76-
ref: 'v2023.12.0'
76+
ref: 'v2023.12.3'
7777
file: 'pipelines/${CI_MACHINE}.yml'
7878
- artifact: '${CI_MACHINE}-jobs.yml'
7979
job: 'generate-job-lists'
@@ -84,7 +84,7 @@ stages:
8484
include:
8585
# [Optional] checks preliminary to running the actual CI test
8686
#- project: 'radiuss/radiuss-shared-ci'
87-
# ref: 'v2023.12.0'
87+
# ref: 'v2023.12.3'
8888
# file: 'preliminary-ignore-draft-pr.yml'
8989
# pipelines subscribed by the project
9090
- local: '.gitlab/subscribed-pipelines.yml'

.gitlab/jobs/corona.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
##############################################################################
77

88
# Override reproducer section to define project specific variables.
9-
.corona_reproducer_vars: &corona_reproducer_vars
9+
.corona_reproducer_vars:
10+
script:
1011
- |
1112
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
1213
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""

.gitlab/jobs/lassen.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
##############################################################################
77

88
# Override reproducer section to define project specific variables.
9-
.lassen_reproducer_vars: &lassen_reproducer_vars
9+
.lassen_reproducer_vars:
10+
script:
1011
- |
1112
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
1213
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""

.gitlab/jobs/poodle.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
###############################################################################
77

88
# Override reproducer section to define projet specific variables.
9-
.poodle_reproducer_vars: &poodle_reproducer_vars
9+
.poodle_reproducer_vars:
10+
script:
1011
- |
1112
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
1213
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""

.gitlab/jobs/ruby.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
###############################################################################
77

88
# Override reproducer section to define project specific variables.
9-
.ruby_reproducer_vars: &ruby_reproducer_vars
9+
.ruby_reproducer_vars:
10+
script:
1011
- |
1112
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
1213
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""

.gitlab/jobs/tioga.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
##############################################################################
77

88
# Override reproducer section to define project specific variables.
9-
.tioga_reproducer_vars: &tioga_reproducer_vars
9+
.tioga_reproducer_vars:
10+
script:
1011
- |
1112
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
1213
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""

.uberenv_config.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
"package_final_phase" : "initconfig",
55
"package_source_dir" : "../..",
66
"spack_url": "https://github.com/spack/spack.git",
7-
"spack_branch": "develop-2024-01-21",
7+
"spack_branch": "develop-2024-02-18",
88
"spack_activate" : {},
99
"spack_configs_path": "scripts/radiuss-spack-configs",
1010
"spack_packages_path": "scripts/radiuss-spack-configs/packages",
1111
"spack_concretizer": "clingo",
12-
"spack_setup_clingo": false,
13-
"debug": true
12+
"spack_setup_clingo": false
1413
}

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ cmake_policy(SET CMP0025 NEW)
1111
include(CMakeDependentOption)
1212
include(CMakePackageConfigHelpers)
1313

14-
project(Chai LANGUAGES C CXX VERSION 2024.02.0)
14+
project(Chai LANGUAGES C CXX VERSION 2024.02.1)
1515
cmake_minimum_required(VERSION 3.14)
1616

1717
include(cmake/SetupChaiOptions.cmake)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[comment]: # (# SPDX-License-Identifier: BSD-3-Clause)
77
[comment]: # (#################################################################)
88

9-
# CHAI v2024.02.0
9+
# CHAI v2024.02.1
1010

1111
[![Azure Build Status](https://dev.azure.com/davidbeckingsale/CHAI/_apis/build/status/LLNL.CHAI?branchName=develop)](https://dev.azure.com/davidbeckingsale/CHAI/_build/latest?definitionId=2&branchName=develop)
1212
[![Build Status](https://travis-ci.org/LLNL/CHAI.svg?branch=develop)](https://travis-ci.org/LLNL/CHAI)

RELEASE_NOTES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ in this file.
1313

1414
The format of this file is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
1515

16+
## [Version 2024.02.1] - Release date 2024-04-19
17+
18+
### Changed
19+
- Updated to BLT v0.6.2, Umpire v2024.02.1, and RAJA v2024.02.1
20+
1621
## [Version 2024.02.0] - Release date 2024-03-04
1722

1823
### Added

0 commit comments

Comments
 (0)