Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scitas-software-stacks
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SCITAS
Software stack
scitas-software-stacks
Commits
83e09d99
Commit
83e09d99
authored
1 month ago
by
Nicolas Richart
Browse files
Options
Downloads
Patches
Plain Diff
Forgot some mention of the buildcache
parent
494e9ed8
Branches
Branches containing commit
No related tags found
2 merge requests
!43
Release/pinot noir/rhel9.4
,
!22
Correcting cpu machines plus clang
Checking pipeline status
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
ci/install.sh
+1
-1
1 addition, 1 deletion
ci/install.sh
ci/install_compilers.sh
+1
-1
1 addition, 1 deletion
ci/install_compilers.sh
ci/setup_spack.sh
+3
-3
3 additions, 3 deletions
ci/setup_spack.sh
ci/stack_env.sh
+1
-0
1 addition, 0 deletions
ci/stack_env.sh
with
6 additions
and
5 deletions
ci/install.sh
+
1
−
1
View file @
83e09d99
...
...
@@ -48,7 +48,7 @@ do
buildcache create
\
--update-index
\
--key
${
GPG_KEY_ID
}
\
${
MOUNT_POINT
}
/buildcache/
$environment
${
BUILDCACHE_PATH
}
echo
"Checking
${
STACK_CONFIG_PATH
}
/mark_explicit_
${
full_environment
}
for spec to mark explicit"
if
[
-e
${
STACK_CONFIG_PATH
}
/mark_explicit_
${
full_environment
}
]
...
...
This diff is collapsed.
Click to expand it.
ci/install_compilers.sh
+
1
−
1
View file @
83e09d99
...
...
@@ -92,7 +92,7 @@ do
buildcache create
\
--update-index
\
--key
${
GPG_KEY_ID
}
\
${
MOUNT_POINT
}
/buildcache/
${
environment
}
${
hashes
}
${
BUILDCACHE_PATH
}
${
hashes
}
for
compiler_hash
in
$(
echo
${
hashes
}
)
;
do
location
=
$(
${
STACK_LOCATION
}
/spack/bin/spack location
-i
${
compiler_hash
}
)
...
...
This diff is collapsed.
Click to expand it.
ci/setup_spack.sh
+
3
−
3
View file @
83e09d99
...
...
@@ -192,11 +192,11 @@ spack/bin/spack \
gpg trust
\
$GPG_PRIVATE_KEY
if
[
!
-d
${
MOUNT_POINT
}
/buildcache/
${
stack
}
/
${
STACK_VERSION
}
/
${
environment
}
/build_cache
]
;
then
if
[
!
-d
${
BUILDCACHE_PATH
}
/build_cache
]
;
then
spack/bin/spack
\
--color
=
always
\
gpg publish
\
-d
${
MOUNT_POINT
}
/buildcache/
${
stack
}
/
${
STACK_VERSION
}
/
${
environment
}
-d
${
BUILDCACHE_PATH
}
fi
if
!
spack/bin/spack mirror list |
grep
buildcache
;
then
...
...
@@ -206,7 +206,7 @@ if ! spack/bin/spack mirror list | grep buildcache; then
mirror add
\
--type
binary
\
--scope
system
\
buildcache file://
${
MOUNT_POINT
}
/buildcache/
${
stack
}
/
${
STACK_VERSION
}
/
${
environment
}
buildcache file://
${
BUILDCACHE_PATH
}
fi
spack/bin/spack
\
...
...
This diff is collapsed.
Click to expand it.
ci/stack_env.sh
+
1
−
0
View file @
83e09d99
...
...
@@ -36,6 +36,7 @@ export STACK_LOCATION=${MOUNT_POINT}/${stack}/${environment}/${STACK_VERSION}
export
full_environment
=
${
environment
}${
suffix
}
export
SPACK_SYSTEM_CONFIG_PATH
=
${
STACK_LOCATION
}
/spack/var/spack/environments/
${
full_environment
}
export
BUILDCACHE_PATH
=
${
MOUNT_POINT
}
/buildcache/
${
stack
}
/
${
STACK_VERSION
}
/
${
environment
}
if
[
"
$accelerator
"
!=
"none"
]
then
export
acc_type
=
$(
echo
$env_json
| jq
-Mrc
'.accelerator.type'
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment