only CI

Author: henderkes

build-static.sh

@@ -205,7 +205,8 @@ else
 	# shellcheck disable=SC2086
 	${spcCommand} build --enable-zts --build-embed ${SPC_OPT_BUILD_ARGS} "${PHP_EXTENSIONS}" --with-libs="${PHP_EXTENSION_LIBS}"
 
-	if [ -n "$GITHUB_ACTIONS" ] || [ -n "$CI" ]; then
+	if [ -n "$CI" ]; then
+		rm -rf ./downloads
 		rm -rf ./source
 	fi
 

docker-bake.hcl

@@ -142,8 +142,7 @@ target "static-builder-musl" {
     args = {
         FRANKENPHP_VERSION = VERSION
         # pass CI flags from the environment so Dockerfiles can propagate them
-        CI = CI
-        GITHUB_ACTIONS = GITHUB_ACTIONS
+        CI = env("CI")
     }
     secret = ["id=github-token,env=GITHUB_TOKEN"]
 }
@@ -169,8 +168,9 @@ target "static-builder-gnu" {
         FRANKENPHP_VERSION = VERSION
         GO_VERSION = GO_VERSION
         # pass CI flags from the environment so Dockerfiles can propagate them
-        CI = CI
-        GITHUB_ACTIONS = GITHUB_ACTIONS
+        # use env() to read from the shell environment running bake
+        CI = env("CI")
+        GITHUB_ACTIONS = env("GITHUB_ACTIONS")
     }
     secret = ["id=github-token,env=GITHUB_TOKEN"]
 }

static-builder-gnu.Dockerfile

@@ -29,11 +29,9 @@ ENV GOTOOLCHAIN=local
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-# Pass through CI environment flags so build-static.sh can detect CI context
+# Pass through CI environment flag so build-static.sh can detect CI context
 ARG CI
-ARG GITHUB_ACTIONS
 ENV CI=${CI}
-ENV GITHUB_ACTIONS=${GITHUB_ACTIONS}
 
 # labels, same as static-builder.Dockerfile
 

static-builder-musl.Dockerfile

@@ -25,11 +25,8 @@ ENV GOTOOLCHAIN=local
 
 SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
 
-# Pass through CI environment flags so build-static.sh can detect CI context
 ARG CI
-ARG GITHUB_ACTIONS
 ENV CI=${CI}
-ENV GITHUB_ACTIONS=${GITHUB_ACTIONS}
 
 LABEL org.opencontainers.image.title=FrankenPHP
 LABEL org.opencontainers.image.description="The modern PHP app server"