Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
PhilWindle committed Sep 12, 2023
1 parent 1b25616 commit e4dd2c4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 2 additions & 0 deletions build-system/scripts/check_rebuild
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set -euo pipefail
TAG=$1
REPOSITORY=$2

exit 1

# If given nothing, then exit with failure to rebuild
[ -n "$TAG" ] || exit 1

Expand Down
4 changes: 2 additions & 2 deletions build-system/scripts/cond_spot_run_build
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ echo "Content hash tag: cache-$CONTENT_HASH"

cd $(query_manifest buildDir $REPOSITORY)

#if ! check_rebuild cache-$CONTENT_HASH $REPOSITORY; then
if ! check_rebuild cache-$CONTENT_HASH $REPOSITORY; then
init_submodules $REPOSITORY
spot_run_script $CONTENT_HASH $SPEC $BUILD_SYSTEM_PATH/remote_build/remote_build $REPOSITORY $@
retry tag_remote_image $REPOSITORY cache-$CONTENT_HASH cache-$CONTENT_HASH
#fi
fi
10 changes: 5 additions & 5 deletions build-system/scripts/cond_spot_run_script
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ shift
CONTENT_HASH=$(calculate_content_hash $REPOSITORY)
echo "Content hash tag: cache-$CONTENT_HASH-$SUCCESS_TAG"

#if ! check_rebuild cache-$CONTENT_HASH-$SUCCESS_TAG $REPOSITORY; then
init_submodules $REPOSITORY
spot_run_script $CONTENT_HASH $@
retry tag_remote_image $REPOSITORY cache-$CONTENT_HASH cache-$CONTENT_HASH-$SUCCESS_TAG
#fi
if ! check_rebuild cache-$CONTENT_HASH-$SUCCESS_TAG $REPOSITORY; then
init_submodules $REPOSITORY
spot_run_script $CONTENT_HASH $@
retry tag_remote_image $REPOSITORY cache-$CONTENT_HASH cache-$CONTENT_HASH-$SUCCESS_TAG
fi

0 comments on commit e4dd2c4

Please sign in to comment.