diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ea69bfe525..92246a1953 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -67,4 +67,4 @@ jobs: with: path: ${{ env.CACHE_DIR }} key: ${{ steps.run-caches-restore.outputs.cache-primary-key }} - if: always() +# if: always() diff --git a/scripts/run_or_skip.sh b/scripts/run_or_skip.sh index 804cfa7b08..cb5a2ad4e7 100755 --- a/scripts/run_or_skip.sh +++ b/scripts/run_or_skip.sh @@ -18,8 +18,7 @@ DIGEST_FILE="$CACHE_DIR/$MAKE_TARGET.digests" mkdir -p "$CACHE_DIR" get_image_ids() { - local depot_pull_out=$(depot pull 2>&1) - local ids="" + local ids="" for img in $(echo "$IMAGES"); do local id=$(docker image inspect "$img" --format='{{.Id}}' 2>/dev/null || true) if [[ -z $id ]]; then @@ -41,6 +40,8 @@ OLD_DIGEST=$(cat "$DIGEST_FILE" 2>/dev/null || echo "") OLD_STATUS=$(echo "$OLD_DIGEST" | cut -d ';' -f1) OLD_IDS=$(echo "$OLD_DIGEST" | cut -d ';' -f2-99) CURRENT_IMAGE_IDS=$(get_image_ids) +docker images +echo $CURRENT_IMAGE_IDS if [[ "$OLD_IDS" == "$CURRENT_IMAGE_IDS" ]]; then if [[ "$FORCE" == "true" ]]; then echo "\$FORCE=$FORCE - Running $MAKE_TARGET despite unchanged images."