formatting

Author: tillkruss

.github/workflows/build.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   build:
-    name: Build PHP ${{ matrix.series.php }} for ${{ matrix.stack.name }}
+    name: Build PHP ${{ matrix.series.php }} (${{ matrix.stack.name }}, ${{ matrix.stack.arch }})
     runs-on: ${{ matrix.stack.os }}
     timeout-minutes: 20
     env:
@@ -27,14 +27,17 @@ jobs:
       matrix:
         stack:
           - name: "heroku-22"
+            arch: "amd64"
             prefix: "dist-heroku-22-develop/"
             upstream: "dist-heroku-22-stable/"
             os: "ubuntu-latest"
           - name: "heroku-24"
+            arch: "amd64"
             prefix: "dist-heroku-24-amd64-develop/"
             upstream: "dist-heroku-24-amd64-stable/"
             os: "ubuntu-latest"
           - name: "heroku-24"
+            arch: "arm64"
             prefix: "dist-heroku-24-arm64-develop/"
             upstream: "dist-heroku-24-arm64-stable/"
             os: "ubuntu-24.04-arm"
@@ -54,6 +57,7 @@ jobs:
           # heroku-24 cannot compile openswoole 4.12.1 anymore, include for heroku-22 only
           - stack:
               name: "heroku-22"
+              arch: "amd64"
               prefix: "dist-heroku-22-develop/"
               upstream: "dist-heroku-22-stable/"
               os: "ubuntu-latest"

.github/workflows/sync.yml

@@ -45,7 +45,7 @@ jobs:
 
       - name: Build Dockerfile
         run: ./scripts/create-dockerfile.sh ${{ matrix.stack.name }}
-        
+
       - name: Docker build
         run: ./scripts/build-dockerfile.sh ${{ matrix.stack.name }}
 

scripts/build-dockerfile.sh

@@ -4,4 +4,4 @@ SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
 
 HEROKUSTACK="$1" # e.g. "heroku-24"
 
-docker build --pull --tag "$HEROKUSTACK" --file "docker/build/${HEROKUSTACK}.Dockerfile" ${SCRIPT_DIR}/..
+docker build --pull --tag "$HEROKUSTACK" --file "docker/build/${HEROKUSTACK}.Dockerfile" ${SCRIPT_DIR}/..

scripts/build-lib.sh

@@ -42,4 +42,4 @@ docker run --rm \
 $HEROKUSTACK \
 ${COMMAND} ${OVERWRITE_FLAG} libraries/${LIBNAME}-${LIBVERSION}
 
-set +x
+set +x

scripts/create-dockerfile.sh

@@ -9,4 +9,4 @@ cat ${SCRIPT_DIR}/../vendor/heroku/heroku-buildpack-php/support/build/_docker/${
 cat <<EOF >> "${SCRIPT_DIR}/../docker/build/${HEROKUSTACK}.Dockerfile"
 ENV WORKSPACE_DIR=/workspace
 ENV PATH=/app/vendor/heroku/heroku-buildpack-php/support/build/_util:\$PATH
-EOF
+EOF

scripts/setup-local.sh

@@ -9,4 +9,4 @@ composer install --working-dir=${SCRIPT_DIR}/.. --prefer-dist --no-progress --no
 cp ${SCRIPT_DIR}/../vendor/heroku/heroku-buildpack-php/requirements.txt .
 
 # Create environment file
-cp ${SCRIPT_DIR}/../.env.example ${SCRIPT_DIR}/../.env
+cp ${SCRIPT_DIR}/../.env.example ${SCRIPT_DIR}/../.env