Merge commit '6262db01d078a7d5c17286014509804ec7cf272e'

earthly · Apr 22, 2024 · 3d27390 · 3d27390
2 parents b59b70d + 6262db0
commit 3d27390
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/tests/registry-certs/Earthfile b/tests/registry-certs/Earthfile
@@ -56,7 +56,11 @@ DO_REMOTE_CACHE_EARTHLY:
     RUN --privileged \
         --mount=type=tmpfs,target=/tmp/earthly \
         -- \
-        EARTHLY_ADDITIONAL_BUILDKIT_CONFIG=$EARTHLY_ADDITIONAL_BUILDKIT_CONFIG$REGISTRY_CONFIG \
-        /usr/bin/earthly-entrypoint.sh --ci --push \
+        ( EARTHLY_ADDITIONAL_BUILDKIT_CONFIG=$EARTHLY_ADDITIONAL_BUILDKIT_CONFIG$REGISTRY_CONFIG \
+            /usr/bin/earthly-entrypoint.sh --ci --push \
             --build-arg REGISTRY=$REGISTRY \
-            $target 2>&1 | tee ./output
+            $target; echo exit_code=$? \
+        ) 2>&1 | tee ./output && \
+        if ! tail -n 1 output | grep 'exit_code=0'; then \
+            echo "ERROR: earthly failed (exit_code=0 not found)" && tail -n 1 output && exit 1; \
+        fi
diff --git a/tests/registry-certs/test.earth b/tests/registry-certs/test.earth
@@ -1,6 +1,6 @@
 VERSION 0.8
 
-ARG REGISTRY
+ARG --global REGISTRY
 
 test-push:
     FROM alpine:3.18