Misc bugfixes

This commit is contained in:
Radon Rosborough 2021-03-26 21:14:19 -07:00
parent 76a2a2d1ee
commit 9bd99c027d
2 changed files with 4 additions and 4 deletions

View File

@ -43,7 +43,7 @@ ifeq ($(I),lang)
node tools/build-lang-image.js --lang $(L)
else ifeq ($(I),ubuntu)
docker pull ubuntu:rolling
docker tag ubuntu:rolling riju:ubuntu
hash="$$(docker inspect ubuntu:rolling | jq '.[0].Id' -r | sha1sum | awk '{ print $1 }')"; echo "FROM ubuntu:rolling" | docker build --label riju.image-hash="$${hash}" -t riju:$(I) -
else ifneq (,$(filter $(I),admin ci))
docker build . -f docker/$(I)/Dockerfile -t riju:$(I) $(NO_CACHE)
else

View File

@ -38,7 +38,7 @@ function getInformationalDependencies() {
`aws s3api list-objects-v2 --bucket riju-debs --prefix hashes`,
{ getStdout: true }
)
).stdout
).stdout || '{"Contents": []}'
).Contents.map(({ Key: key }) => {
const [_, remoteName, remoteHash] = key.split("/");
return [remoteName, remoteHash];
@ -53,7 +53,7 @@ function getInformationalDependencies() {
`aws s3api list-objects-v2 --bucket riju-debs --prefix test-hashes/lang`,
{ getStdout: true }
)
).stdout
).stdout || '{"Contents": []}'
).Contents.map(({ Key: key }) => {
const [_1, _2, remoteName, remoteHash] = key.split("/");
return [remoteName, remoteHash];
@ -355,7 +355,7 @@ async function executeDepGraph({
return hash;
}
const promiseSets = [promises.published, promises.local];
if (holdLocal) {
if (holdManual) {
sets.reverse();
}
for (const promiseSet of promiseSets) {