Skip to content

Commit e27d3be

Browse files
committed
#2454: Update test_spack_package to use newer version of spack
1 parent 60c5e8a commit e27d3be

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

.github/workflows/develop-pipelines.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- develop
7+
pull_request:
78

89
jobs:
910
prepare:
@@ -21,7 +22,7 @@ jobs:
2122
with:
2223
target: vt-develop
2324

24-
bake-develop:
25+
bake:
2526
needs:
2627
- prepare
2728
runs-on: ubuntu-latest

ci/test_spack_package.sh

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
#!/usr/bin/env bash
22

3+
set -euo pipefail
4+
35
cur_path=$(pwd)
4-
spack_path="$cur_path/spack"
56
vt_spack_package="$cur_path/spack-package"
67

7-
git clone https://github.com/spack/spack.git
8-
git clone https://github.com/DARMA-tasking/spack-package.git
8+
apt update -y -q && apt install -y -q libssl-dev unzip patch xz-utils gfortran
9+
10+
git clone --branch v0.23.1 --depth=2 https://github.com/spack/spack.git
11+
. spack/share/spack/setup-env.sh
912

10-
cd "$spack_path" || exit 1
11-
git checkout v0.16.3
12-
cd "$cur_path" || exit 1
13+
git clone -b master https://github.com/DARMA-tasking/spack-package.git
1314

1415
declare -A variables_map
1516
variables_map["lb_enabled"]="${VT_LB_ENABLED:-0}"
1617
variables_map["trace_enabled"]="${VT_TRACE_ENABLED:-0}"
17-
variables_map["trace_only"]="${VT_BUILD_TRACE_ONLY:-0}"
18+
variables_map["trace_only"]="${VT_BUILD_TRACE_ONLY:-1}"
1819
variables_map["doxygen_enabled"]="${VT_DOXYGEN_ENABLED:-0}"
1920
variables_map["mimalloc_enabled"]="${VT_MIMALLOC_ENABLED:-0}"
2021
variables_map["asan_enabled"]="${VT_ASAN_ENABLED:-0}"
@@ -26,6 +27,7 @@ variables_map["diagnostics_enabled"]="${VT_DIAGNOSTICS_ENABLED:-0}"
2627
variables_map["diagnostics_runtime_enabled"]="${VT_DIAGNOSTICS_RUNTIME_ENABLED:-0}"
2728
variables_map["unity_build_enabled"]="${VT_UNITY_BUILD_ENABLED:-0}"
2829
variables_map["fcontext_enabled"]="${VT_FCONTEXT_ENABLED:-0}"
30+
variables_map["kokkos"]="${VT_KOKKOS_ENABLED:-0}"
2931

3032
cmd_vars=()
3133
for flag in "${!variables_map[@]}"
@@ -40,16 +42,17 @@ do
4042
done
4143

4244
install_cmd=$(printf " %s" "${cmd_vars[@]}")
43-
install_cmd="$spack_path/bin/spack install darma-vt@develop build_type=Release ${install_cmd:1}"
45+
install_cmd="spack install darma-vt@develop build_type=Release ${install_cmd:1}"
4446

45-
"$spack_path"/bin/spack repo add "$vt_spack_package"
46-
"$spack_path"/bin/spack external find
47+
spack clean --all
48+
spack repo add "$vt_spack_package"
49+
spack external find
4750
$install_cmd
4851

4952
git clone https://github.com/DARMA-tasking/vt-sample-project
5053
mkdir -p vt-sample-project/build
5154
cd vt-sample-project/build || exit 1
52-
vt_DIR=$("$spack_path"/bin/spack location --install-dir darma-vt)
55+
vt_DIR=$(spack location --install-dir darma-vt)
5356
export vt_DIR
5457
cmake -G "${CMAKE_GENERATOR:-Ninja}" \
5558
-DCMAKE_BUILD_TYPE=Release \

0 commit comments

Comments
 (0)