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
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ RUN curl -s -L https://github.com/Kitware/CMake/releases/download/v$CMAKE/cmake-

# And spack deps
RUN git clone --depth 1 https://github.com/spack/spack /opt/spack && \
sed -i 's/_tracked_deps = ht.dag_hash.deptype/_tracked_deps = ("link", "run",)/' /opt/spack/lib/spack/spack/database.py && \
python3 -m pip install --upgrade pip && \
python3 -m pip install clingo && \
spack compiler find && \
Expand Down
22 changes: 7 additions & 15 deletions pakages/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ def prepare_cache(self, registries=None, tag=None):
# https://docs.github.com/en/rest/reference/packages#list-packages-for-an-organization
for pkg_id, request in self._pakages_tasks.items():

spec_id = f"{request.pkg.spec.name}:{request.pkg.spec.version}"
if spec_id in requests:
del requests[spec_id]

# Don't continue if installed!
if request.pkg.spec.install_status() == True:
continue
Expand Down Expand Up @@ -160,21 +164,9 @@ def prepare_cache(self, registries=None, tag=None):
# I haven't tested it yet
spec_id = f"{spec.name}:{spec.version}"
if spec_id in requests:

# update the build request
requests[spec_id].pkg.spec = spec
requests[spec_id].pkg_id = spack.installer.package_id(
spec.package
)
requests[spec_id].dependencies = {
f"{x.name}-{x.version}-{x._hash}"
for x in spec.dependencies()
}

# And flag the task as installed
task = requests[spec_id]
requests[spec_id].task = spack.installer.STATUS_INSTALLED
self._flag_installed(task.pkg, spec.dependents())
del requests[spec_id]
if not requests:
break

# And finish this piece of the install
spec.package.installed_from_binary_cache = True
Expand Down
4 changes: 2 additions & 2 deletions pakages/oras.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@ def fetch(self, url, save_file):
# We don't have programmatic access to list, so we just try to pull
save_dir = os.path.dirname(save_file)
try:
logger.debug("Trying fetch for oras {0}".format(url))
logger.debug("Trying fetch for {0}".format(url))
self.oras("pull", url, "-a", "--output", save_dir, output=str, error=str)
except:
logger.debug("{0} is not available for pull.".format(url))
return

# Just print those that are successful
logger.info("Fetched oras {0}".format(url))
logger.info("Fetched {0}".format(url))
# Files are technically saved with the hash, we just hope spack will use
files = os.listdir(save_dir)
if len(files) > 0:
Expand Down