use same FRANKENPHP_VERSION and make sure to let pr's run the rpm generation too (version 0.0.0) to see issues

Author: henderkes

.github/workflows/static.yaml

@@ -216,6 +216,7 @@ jobs:
           targets: static-builder-gnu
           set: |
             ${{ (github.event_name == 'pull_request' || matrix.platform == 'linux/arm64') && 'static-builder-gnu.args.NO_COMPRESS=1' || '' }}
+            static-builder-gnu.args.BUILD_PACKAGES=1
             *.tags=
             *.platform=${{ matrix.platform }}
             *.cache-from=type=gha,scope=${{ needs.prepare.outputs.ref || github.ref }}-static-builder-gnu

build-packages.sh

@@ -31,9 +31,29 @@ if [ ! -f "dist/$bin" ]; then
 	exit 1
 fi
 
+if [ -z "${FRANKENPHP_VERSION}" ]; then
+	FRANKENPHP_VERSION="$(git rev-parse --verify HEAD)"
+	export FRANKENPHP_VERSION
+elif [ -d ".git/" ]; then
+	CURRENT_REF="$(git rev-parse --abbrev-ref HEAD)"
+	export CURRENT_REF
+
+	if echo "${FRANKENPHP_VERSION}" | grep -F -q "."; then
+		# Tag
+
+		# Trim "v" prefix if any
+		FRANKENPHP_VERSION=${FRANKENPHP_VERSION#v}
+		export FRANKENPHP_VERSION
+
+		git checkout "v${FRANKENPHP_VERSION}"
+	else
+		git checkout "${FRANKENPHP_VERSION}"
+	fi
+fi
+
 if [[ ! "${FRANKENPHP_VERSION}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
 	echo "Error: FRANKENPHP_VERSION must be set to X.Y.Z (e.g. 1.5.1), got '${FRANKENPHP_VERSION}'"
-	exit 1
+	FRANKENPHP_VERSION=0.0.0
 fi
 
 iteration="1"

static-builder-gnu.Dockerfile

@@ -6,6 +6,8 @@ FROM centos:7
 ARG FRANKENPHP_VERSION=''
 ENV FRANKENPHP_VERSION=${FRANKENPHP_VERSION}
 
+ARG BUILD_PACKAGES=''
+
 ARG PHP_VERSION=''
 ENV PHP_VERSION=${PHP_VERSION}
 
@@ -133,4 +135,7 @@ COPY --link caddy caddy
 COPY --link internal internal
 
 RUN --mount=type=secret,id=github-token ./build-static.sh && \
-	rm -Rf dist/static-php-cli/source/*
+	rm -Rf dist/static-php-cli/source/* && \
+    if [ "${BUILD_PACKAGES}" != "" ]; then \
+        ./build-packages.sh; \
+    fi