diff --git a/.woodpecker.yml b/.woodpecker.yml index 972ceee..ffa58be 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -9,6 +9,7 @@ pipeline: build_args: - ALPINE_VERSION=${ALPINE_VERSION} - BASE_IMAGE=registry.nulo.in/sutty/containers-sdk-ruby + cache_from: registry.nulo.in/sutty/containers-gem-compiler username: sutty secrets: - docker_password diff --git a/bulk-compiler.sh b/bulk-compiler.sh index d953b17..a2f5478 100755 --- a/bulk-compiler.sh +++ b/bulk-compiler.sh @@ -8,14 +8,20 @@ test -n "${PLATFORM}" install -dm 755 -o builder -g builder cache gems -find build/ -type f | - sed -re "s|^build/([^/]+)/(.*)|&\tbuilt/${ALPINE_VERSION}/\1/\2\t\1\t\2|" | - while read BUILD BUILT GEM_NAME GEM_VERSION; do - test -f "${BUILT}" && continue +echo "1..$(find build/ -type f | grep -v /.keep | wc -l)" - FAILED="failed/${ALPINE_VERSION}/${GEM_NAME}/${GEM_VERSION}" +find build/ -type f | grep -v /.keep | nl | + sed -re "s|\tbuild/([^/]+)/(.*)|&\tbuilt/${ALPINE_VERSION}/\1/\2\tfailed/${ALPINE_VERSION}/\1/\2\t\1\t\2|" | + while read NUMBER BUILD BUILT FAILED GEM_NAME GEM_VERSION; do + if test -f "${BUILT}" ; then + echo "ok ${NUMBER} - ${GEM_NAME} ${GEM_VERSION} already built, skipping" + continue + fi - test -f "${FAILED}" && continue + if test -f "${FAILED}" ; then + echo "not ok ${NUMBER} - ${GEM_NAME} ${GEM_VERSION} failed previously" + continue + fi unset EXTRA_PKGS EXTRA_GEMS GEM_COMPILER_FLAGS @@ -36,6 +42,7 @@ find build/ -type f | if test $? -ne 0 ; then BUILT="${FAILED}" + echo "not ok ${NUMBER} - ${GEM_NAME} ${GEM_VERSION} build failed" fi set -e