Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ stages:
include:
- local: '.gitlab/custom-jobs-and-variables.yml'
- project: 'radiuss/radiuss-shared-ci'
ref: 'v2023.12.0'
ref: 'v2023.12.3'
file: 'pipelines/${CI_MACHINE}.yml'
- artifact: '${CI_MACHINE}-jobs.yml'
job: 'generate-job-lists'
Expand All @@ -84,7 +84,7 @@ stages:
include:
# [Optional] checks preliminary to running the actual CI test
#- project: 'radiuss/radiuss-shared-ci'
# ref: 'v2023.12.0'
# ref: 'v2023.12.3'
# file: 'preliminary-ignore-draft-pr.yml'
# pipelines subscribed by the project
- local: '.gitlab/subscribed-pipelines.yml'
3 changes: 2 additions & 1 deletion .gitlab/jobs/corona.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
##############################################################################

# Override reproducer section to define project specific variables.
.corona_reproducer_vars: &corona_reproducer_vars
.corona_reproducer_vars:
script:
- |
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
Expand Down
3 changes: 2 additions & 1 deletion .gitlab/jobs/lassen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
##############################################################################

# Override reproducer section to define project specific variables.
.lassen_reproducer_vars: &lassen_reproducer_vars
.lassen_reproducer_vars:
script:
- |
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
Expand Down
3 changes: 2 additions & 1 deletion .gitlab/jobs/poodle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
###############################################################################

# Override reproducer section to define projet specific variables.
.poodle_reproducer_vars: &poodle_reproducer_vars
.poodle_reproducer_vars:
script:
- |
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
Expand Down
3 changes: 2 additions & 1 deletion .gitlab/jobs/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
###############################################################################

# Override reproducer section to define project specific variables.
.ruby_reproducer_vars: &ruby_reproducer_vars
.ruby_reproducer_vars:
script:
- |
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
Expand Down
3 changes: 2 additions & 1 deletion .gitlab/jobs/tioga.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
##############################################################################

# Override reproducer section to define project specific variables.
.tioga_reproducer_vars: &tioga_reproducer_vars
.tioga_reproducer_vars:
script:
- |
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
Expand Down
5 changes: 2 additions & 3 deletions .uberenv_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
"package_final_phase" : "initconfig",
"package_source_dir" : "../..",
"spack_url": "https://github.com/spack/spack.git",
"spack_branch": "develop-2024-01-21",
"spack_branch": "develop-2024-02-18",
"spack_activate" : {},
"spack_configs_path": "scripts/radiuss-spack-configs",
"spack_packages_path": "scripts/radiuss-spack-configs/packages",
"spack_concretizer": "clingo",
"spack_setup_clingo": false,
"debug": true
"spack_setup_clingo": false
}
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cmake_policy(SET CMP0025 NEW)
include(CMakeDependentOption)
include(CMakePackageConfigHelpers)

project(Chai LANGUAGES C CXX VERSION 2024.02.0)
project(Chai LANGUAGES C CXX VERSION 2024.02.1)
cmake_minimum_required(VERSION 3.14)

include(cmake/SetupChaiOptions.cmake)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[comment]: # (# SPDX-License-Identifier: BSD-3-Clause)
[comment]: # (#################################################################)

# CHAI v2024.02.0
# CHAI v2024.02.1

[![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)
[![Build Status](https://travis-ci.org/LLNL/CHAI.svg?branch=develop)](https://travis-ci.org/LLNL/CHAI)
Expand Down
5 changes: 5 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ in this file.

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

## [Version 2024.02.1] - Release date 2024-04-19

### Changed
- Updated to BLT v0.6.2, Umpire v2024.02.1, and RAJA v2024.02.1

## [Version 2024.02.0] - Release date 2024-03-04

### Added
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
# The short X.Y version.
version = u'2024.02'
# The full version, including alpha/beta/rc tags.
release = u'2024.02.0'
release = u'2024.02.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/conf.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ author = u''
# The short X.Y version.
version = u'2024.02'
# The full version, including alpha/beta/rc tags.
release = u'2024.02.0'
release = u'2024.02.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion scripts/make_release_tarball.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
##############################################################################

TAR_CMD=gtar
VERSION=2024.02.0
VERSION=2024.02.1

git archive --prefix=chai-${VERSION}/ -o chai-${VERSION}.tar HEAD 2> /dev/null

Expand Down