Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
dedal
Manage
Activity
Members
Labels
Plan
Issues
2
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Harbor Registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EBRAINS RI
Tech Hub
Platform
EBRAINS Software Distribution
dedal
Commits
8457fb49
Commit
8457fb49
authored
8 months ago
by
Eric Müller
Browse files
Options
Downloads
Patches
Plain Diff
fix: spackdir not needed for stage "build-base-image"
Change-Id: I8fb1fe396c83c50eabd57cf09012c63adc6923ba
parent
9c44e5f1
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bin/yashchiki
+10
-3
10 additions, 3 deletions
bin/yashchiki
with
10 additions
and
3 deletions
bin/yashchiki
+
10
−
3
View file @
8457fb49
...
...
@@ -134,9 +134,6 @@ args = parser.parse_args()
root_dir
=
pathlib
.
Path
(
__file__
).
parent
.
parent
# check provided paths
if
not
args
.
spack_dir
.
is_dir
():
raise
NotADirectoryError
(
"
spack_dir is required to be a path to an
"
"
existing directory.
"
)
if
(
args
.
meta_dir
is
not
None
)
and
(
not
args
.
meta_dir
.
is_dir
()):
raise
NotADirectoryError
(
"
meta-dir is required to be a path to an
"
"
existing directory.
"
)
...
...
@@ -191,14 +188,19 @@ env.update({
"
YASHCHIKI_JOBS
"
:
str
(
args
.
jobs
),
})
needs_spackdir
=
False
if
"
fetch
"
in
args
.
stages
:
env
.
update
({
"
YASHCHIKI_ENABLE_STAGE_FETCH
"
:
"
1
"
})
needs_spackdir
=
True
if
"
build-base
"
in
args
.
stages
:
env
.
update
({
"
YASHCHIKI_ENABLE_STAGE_BUILD_BASE
"
:
"
1
"
})
needs_spackdir
=
True
if
"
build-spack
"
in
args
.
stages
:
env
.
update
({
"
YASHCHIKI_ENABLE_STAGE_BUILD_SPACK
"
:
"
1
"
})
needs_spackdir
=
True
if
"
image
"
in
args
.
stages
:
env
.
update
({
"
YASHCHIKI_ENABLE_STAGE_IMAGE
"
:
"
1
"
})
...
...
@@ -207,6 +209,11 @@ if args.stages != all_stages:
if
not
pathlib
.
Path
(
args
.
sandboxes_dir
,
args
.
style
).
exists
():
raise
RuntimeError
(
"
Using yashchiki with incomplete set of stages is only possible for using an existing sandbox.
"
)
if
needs_spackdir
:
if
not
args
.
spack_dir
.
is_dir
():
raise
NotADirectoryError
(
"
spack_dir is required to be a path to an
"
"
existing directory.
"
)
if
args
.
build_cache_on_failure_name
:
env
.
update
({
"
YASHCHIKI_BUILD_CACHE_ON_FAILURE_NAME
"
:
args
.
build_cache_on_failure_name
})
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
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