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

Jump to bottom

update spack2 v2 to spack2 v3 #83

Merged
merged 4 commits into from
Nov 30, 2023
Merged

update spack2 v2 to spack2 v3 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f9b8bf2
update spack2 v2 to spack2 v3
jonahm-LANL Nov 30, 2023
7e2c42d
oops missing @main
jonahm-LANL Nov 30, 2023
ee74d01
add test variant
jonahm-LANL Nov 30, 2023
1b2976e
oops typo
jonahm-LANL Nov 30, 2023
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 .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ variables:
GIT_SUBMODULE_STRATEGY: recursive
SPINER_GCC_VERSION: "9.3.0"
SPINER_CUDA_VERSION: "11.6.0"
SPINER_SPACK_SPEC: "spiner@main+python%gcc@${SPINER_GCC_VERSION}"
SPINER_SPACK_SPEC: "spiner@main+python+test%gcc@${SPINER_GCC_VERSION}"
COLOR_CYAN: "\e[1;36m"
COLOR_PLAIN: "\e[0m"
# set to different spack upstream for testing
Expand Down
5 changes: 4 additions & 1 deletion spack-repo/packages/spiner/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,12 @@ class Spiner(CMakePackage, CudaPackage):

variant("python", default=False, description="Python, Numpy & Matplotlib Support")

variant("test", default=False, description="Build tests")

depends_on("[email protected]:", when="@:1.5.1")
depends_on("[email protected]:", when="@1.6.0:")
depends_on("[email protected]:2.13.9")
depends_on("[email protected]:", when="@main +test")
depends_on("[email protected]:2.13.9", when="@:1.6.2 +test")
depends_on("[email protected]:", when="@:1.5.1")
depends_on("[email protected]:", when="@1.6.0:")
depends_on("ports-of-call@main", when="@main")
Expand Down
3 changes: 2 additions & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@

spiner_content_declare(Catch2
GIT_REPO https://github.com/catchorg/Catch2.git
GIT_TAG v2.13.7
GIT_TAG v3.0.1 # or any later release
Yurlungur marked this conversation as resolved.
Show resolved Hide resolved
EXPECTED_TARGETS Catch2::Catch2
NAMESPACE spinerTest
)

Expand Down
4 changes: 2 additions & 2 deletions test/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
#include "hdf5_hl.h"
#endif

#define CATCH_CONFIG_RUNNER
#include "catch2/catch.hpp"
#include <catch2/catch_session.hpp>
#include <catch2/catch_test_macros.hpp>

using DataBox = Spiner::DataBox<Real>;
using Spiner::IndexType;
Expand Down
Loading