MirrorMirror
/
riju
mirror of https://github.com/radian-software/riju.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More bugfixes

This commit is contained in:
Radon Rosborough 2021-03-26 21:30:50 -07:00
parent 9bd99c027d
commit 5f523f8142
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -43,7 +43,7 @@ ifeq ($(I),lang)
node tools/build-lang-image.js --lang $(L) node tools/build-lang-image.js --lang $(L)
else ifeq ($(I),ubuntu) else ifeq ($(I),ubuntu)
docker pull ubuntu:rolling docker pull ubuntu:rolling
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) - 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)) else ifneq (,$(filter $(I),admin ci))
docker build . -f docker/$(I)/Dockerfile -t riju:$(I) $(NO_CACHE) docker build . -f docker/$(I)/Dockerfile -t riju:$(I) $(NO_CACHE)
else else

4
tools/depgraph.js
View File

@ -197,7 +197,7 @@ async function getLanguageTestArtifact({ lang }) {
} }
}, },
getPublishedHash: async ({ s3TestHashes }) => { getPublishedHash: async ({ s3TestHashes }) => {
return s3TestHashes[lang]; return s3TestHashes[lang] || null;
}, },
getDesiredHash: async (dependencyHashes) => { getDesiredHash: async (dependencyHashes) => {
return await getTestHash(lang, dependencyHashes["image:runtime"]); return await getTestHash(lang, dependencyHashes["image:runtime"]);
@ -356,7 +356,7 @@ async function executeDepGraph({
} }
const promiseSets = [promises.published, promises.local]; const promiseSets = [promises.published, promises.local];
if (holdManual) { if (holdManual) {
sets.reverse(); promiseSets.reverse();
} }
for (const promiseSet of promiseSets) { for (const promiseSet of promiseSets) {
const hash = await promiseSet[target]; const hash = await promiseSet[target];