Upgrade to v3.x

.env.example

@@ -2,8 +2,5 @@ S3_BUCKET=<heroku-php-extensions>
 S3_PREFIX=<dist-heroku-22-develop/>
 S3_REGION=s3
 
-UPSTREAM_S3_BUCKET=lang-php
-UPSTREAM_S3_PREFIX=dist-heroku-22-stable/
-
 AWS_ACCESS_KEY_ID=<your-access-key>
 AWS_SECRET_ACCESS_KEY=<your-access-secret>

.github/workflows/build.yml

@@ -1,37 +1,68 @@
-
 name: Build extensions
 
 on:
   push:
-    branches:
-      - main
+    branches: [main]
+  workflow_dispatch:
+  workflow_call:
+    inputs:
+      S3_PREFIX:
+        type: string
+        default: ""
 
 jobs:
-
   build:
-    name: Build and deploy
-    runs-on: ubuntu-latest
+    name: Build and deploy ${{ matrix.stack.name }} extensions with PHP ${{ matrix.series.php }} on ${{ matrix.stack.os }}
+    runs-on: ${{ matrix.stack.os }}
     timeout-minutes: 20
-
     env:
-      S3_BUCKET: heroku-php-extensions
+      S3_BUCKET: ${{ secrets.S3_BUCKET || 'heroku-php-extensions' }}
+      S3_REGION: ${{ secrets.S3_REGION || '' }}
+      S3_PREFIX: ${{ inputs.S3_PREFIX || matrix.stack.prefix }}
       BUILDPACK: ./vendor/heroku/heroku-buildpack-php
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
     strategy:
+      fail-fast: true
       matrix:
         stack:
-          - heroku-20
-          - heroku-22
+          - name: "heroku-22"
+            prefix: "dist-heroku-22-develop/"
+            os: "ubuntu-latest"
+          - name: "heroku-24"
+            prefix: "dist-heroku-24-amd64-develop/"
+            os: "ubuntu-latest"
+          - name: "heroku-24"
+            prefix: "dist-heroku-24-arm64-develop/"
+            os: "ubuntu-24.04-arm"
         series:
-          - 20210902 # PHP 8.1
-          - 20220829 # PHP 8.2
-          - 20230831 # PHP 8.3
+          - {version: 20210902, php: "8.1", liblzf: "3.6", lz4: "1.9.3", zstd: "1.4.9", igbinary: "3.2.15", msgpack: "2.2.0", redis: ["5.3.7", "6.3.0"], relay: ["0.6.8"], swoole: ["4.8.13", "5.1.8", "6.1.7"], openswoole: ["4.12.1", "22.1.2"]}
+          - {version: 20220829, php: "8.2", liblzf: "3.6", lz4: "1.9.3", zstd: "1.4.9", igbinary: "3.2.15", msgpack: "2.2.0", redis: ["5.3.7", "6.3.0"], relay: ["0.6.8"], swoole: ["4.8.13", "5.1.8", "6.1.7"], openswoole: ["22.1.2", "25.2.0", "26.2.0"]}
+          - {version: 20230831, php: "8.3", liblzf: "3.6", lz4: "1.9.3", zstd: "1.4.9", igbinary: "3.2.15", msgpack: "2.2.0", redis: ["5.3.7", "6.3.0"], relay: ["0.6.8", "0.20.0"], swoole: ["5.1.8", "6.1.7"], openswoole: ["22.1.2", "25.2.0", "26.2.0"]}
+          - {version: 20240924, php: "8.4", liblzf: "3.6", lz4: "1.9.3", zstd: "1.4.9", igbinary: "3.2.15", msgpack: "2.2.0", redis: ["6.3.0"], relay: ["0.20.0"], swoole: ["6.1.7"], openswoole: ["25.2.0", "26.2.0"]}
+          - {version: 20250925, php: "8.5", liblzf: "3.6", lz4: "1.10.0", zstd: "1.5.7", igbinary: "3.2.17RC1", msgpack: "2.2.0", redis: ["6.3.0"], relay: ["0.20.0"], swoole: ["6.2.0RC1"], openswoole: ["26.2.0"]}
+        exclude:
+          # heroku-24 no longer supports php-8.1
+          - stack:
+              name: "heroku-24"
+            series:
+              version: 20210902
+        include:
+          # heroku-24 cannot compile openswoole 4.12.1 anymore, include for heroku-22 only
+          - stack:
+              name: "heroku-22"
+              prefix: "dist-heroku-22-develop/"
+              os: "ubuntu-latest"
+            series:
+              version: 20220829
+              php: "8.2"
+              openswoole:
+                - "4.12.1"
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Composer Install
         run: composer install --prefer-dist --no-progress --no-suggest --ignore-platform-reqs
@@ -40,114 +71,50 @@ jobs:
         run: cp ${BUILDPACK}/requirements.txt .
 
       - name: Build Dockerfile
-        run: |
-          cat ${BUILDPACK}/support/build/_docker/${{ matrix.stack }}.Dockerfile > docker/build/${{ matrix.stack }}.Dockerfile
-          cat docker/${{ matrix.stack }}.Dockerfile >> docker/build/${{ matrix.stack }}.Dockerfile
+        run: ./scripts/create-dockerfile.sh ${{ matrix.stack.name }}
 
       - name: Docker build
-        run: docker build --pull --tag ${{ matrix.stack }} --file docker/build/${{ matrix.stack }}.Dockerfile .
+        run: ./scripts/build-dockerfile.sh ${{ matrix.stack.name }}
 
       - name: Build liblzf library
-        shell: 'script -q -e -c "bash {0}"'
-        run: |
-          docker run --rm -ti \
-            --env-file=${BUILDPACK}/support/build/_docker/env.default \
-            ${{ matrix.stack }} deploy.sh --overwrite libraries/liblzf-3.6
+        run: ./scripts/build-lib.sh ${{ matrix.stack.name }} liblzf "${{ matrix.series.liblzf }}" true
 
       - name: Build lz4 library
-        shell: 'script -q -e -c "bash {0}"'
-        run: |
-          docker run --rm -ti \
-            --env-file=${BUILDPACK}/support/build/_docker/env.default \
-            ${{ matrix.stack }} deploy.sh --overwrite libraries/lz4-1.9.3
+        run: ./scripts/build-lib.sh ${{ matrix.stack.name }} lz4 "${{ matrix.series.lz4 }}" true
 
       - name: Build zstd library
-        shell: 'script -q -e -c "bash {0}"'
-        run: |
-          docker run --rm -ti \
-            --env-file=${BUILDPACK}/support/build/_docker/env.default \
-            ${{ matrix.stack }} deploy.sh --overwrite libraries/zstd-1.4.9
+        run: ./scripts/build-lib.sh ${{ matrix.stack.name }} zstd "${{ matrix.series.zstd }}" true
 
       - name: Build igbinary extension
-        shell: 'script -q -e -c "bash {0}"'
-        run: |
-          docker run --rm -ti \
-            --env UPSTREAM_S3_BUCKET=lang-php \
-            --env UPSTREAM_S3_PREFIX=dist-${{ matrix.stack }}-stable/ \
-            --env-file=${BUILDPACK}/support/build/_docker/env.default \
-            ${{ matrix.stack }} deploy.sh --overwrite \
-            extensions/no-debug-non-zts-${{ matrix.series }}/igbinary-3.2.15
+        run: ./scripts/build-extension.sh ${{ matrix.stack.name }} ${{ matrix.series.php }} ${{ matrix.series.version }} igbinary "${{ matrix.series.igbinary }}" "php-${{ matrix.series.php }}.*" ${{ matrix.stack.prefix }} true
 
       - name: Build msgpack extension
-        shell: 'script -q -e -c "bash {0}"'
-        run: |
-          docker run --rm -ti \
-            --env UPSTREAM_S3_BUCKET=lang-php \
-            --env UPSTREAM_S3_PREFIX=dist-${{ matrix.stack }}-stable/ \
-            --env-file=${BUILDPACK}/support/build/_docker/env.default \
-            ${{ matrix.stack }} deploy.sh --overwrite \
-            extensions/no-debug-non-zts-${{ matrix.series }}/msgpack-2.2.0
-
-      - name: Build redis extension
-        shell: 'script -q -e -c "bash {0}"'
+        run: ./scripts/build-extension.sh ${{ matrix.stack.name }} ${{ matrix.series.php }} ${{ matrix.series.version }} msgpack "${{ matrix.series.msgpack }}" "php-${{ matrix.series.php }}.*" ${{ matrix.stack.prefix }} true
+
+      - name: Build redis extensions
         run: |
-          docker run --rm -ti \
-            --env UPSTREAM_S3_BUCKET=lang-php \
-            --env UPSTREAM_S3_PREFIX=dist-${{ matrix.stack }}-stable/ \
-            --env-file=${BUILDPACK}/support/build/_docker/env.default \
-            ${{ matrix.stack }} deploy.sh --overwrite \
-            extensions/no-debug-non-zts-${{ matrix.series }}/redis-6.0.2
+          set -e
+          for VERSION in ${{ join(matrix.series.redis, ' ') }}; do
+            ./scripts/build-extension.sh ${{ matrix.stack.name }} ${{ matrix.series.php }} ${{ matrix.series.version }} redis "$VERSION" "php-${{ matrix.series.php }}.*,libraries/liblzf-*,libraries/lz4-*,libraries/zstd-*,extensions/no-debug-non-zts-${{ matrix.series.version }}/igbinary-*,extensions/no-debug-non-zts-${{ matrix.series.version }}/msgpack-*" ${{ matrix.stack.prefix }} true
+          done
 
       - name: Build relay extension
-        shell: 'script -q -e -c "bash {0}"'
-        run: |
-          docker run --rm -ti \
-            --env UPSTREAM_S3_BUCKET=lang-php \
-            --env UPSTREAM_S3_PREFIX=dist-${{ matrix.stack }}-stable/ \
-            --env-file=${BUILDPACK}/support/build/_docker/env.default \
-            ${{ matrix.stack }} deploy.sh --overwrite \
-            extensions/no-debug-non-zts-${{ matrix.series }}/relay-0.6.8
-
-      - name: Build swoole 4.x extension
-        if: matrix.series <= 20220829
-        shell: 'script -q -e -c "bash {0}"'
         run: |
-          docker run --rm -ti \
-            --env UPSTREAM_S3_BUCKET=lang-php \
-            --env UPSTREAM_S3_PREFIX=dist-${{ matrix.stack }}-stable/ \
-            --env-file=${BUILDPACK}/support/build/_docker/env.default \
-            ${{ matrix.stack }} deploy.sh --overwrite \
-            extensions/no-debug-non-zts-${{ matrix.series }}/swoole-4.8.13
-
-      - name: Build swoole 5.x extension
-        if: matrix.series >= 20230831
-        shell: 'script -q -e -c "bash {0}"'
-        run: |
-          docker run --rm -ti \
-            --env UPSTREAM_S3_BUCKET=lang-php \
-            --env UPSTREAM_S3_PREFIX=dist-${{ matrix.stack }}-stable/ \
-            --env-file=${BUILDPACK}/support/build/_docker/env.default \
-            ${{ matrix.stack }} deploy.sh --overwrite \
-            extensions/no-debug-non-zts-${{ matrix.series }}/swoole-5.1.1
-
-      - name: Build openswoole 4.x extension
-        if: matrix.series <= 20220829
-        shell: 'script -q -e -c "bash {0}"'
+          set -e
+          for VERSION in ${{ join(matrix.series.relay, ' ') }}; do
+            ./scripts/build-extension.sh ${{ matrix.stack.name }} ${{ matrix.series.php }} ${{ matrix.series.version }} relay "$VERSION" "php-${{ matrix.series.php }}.*,libraries/liblzf-*,libraries/lz4-*,libraries/zstd-*,extensions/no-debug-non-zts-${{ matrix.series.version }}/igbinary-*,extensions/no-debug-non-zts-${{ matrix.series.version }}/msgpack-*" ${{ matrix.stack.prefix }} true
+          done
+
+      - name: Build swoole extension
         run: |
-          docker run --rm -ti \
-            --env UPSTREAM_S3_BUCKET=lang-php \
-            --env UPSTREAM_S3_PREFIX=dist-${{ matrix.stack }}-stable/ \
-            --env-file=${BUILDPACK}/support/build/_docker/env.default \
-            ${{ matrix.stack }} deploy.sh --overwrite \
-            extensions/no-debug-non-zts-${{ matrix.series }}/openswoole-4.12.1
-
-      - name: Build openswoole 22.x extension
-        if: matrix.series >= 20230831
-        shell: 'script -q -e -c "bash {0}"'
+          set -e
+          for VERSION in ${{ join(matrix.series.swoole, ' ') }}; do
+            ./scripts/build-extension.sh ${{ matrix.stack.name }} ${{ matrix.series.php }} ${{ matrix.series.version }} swoole "$VERSION" "php-${{ matrix.series.php }}.*" ${{ matrix.stack.prefix }} true
+          done
+
+      - name: Build openswoole extension
         run: |
-          docker run --rm -ti \
-            --env UPSTREAM_S3_BUCKET=lang-php \
-            --env UPSTREAM_S3_PREFIX=dist-${{ matrix.stack }}-stable/ \
-            --env-file=${BUILDPACK}/support/build/_docker/env.default \
-            ${{ matrix.stack }} deploy.sh --overwrite \
-            extensions/no-debug-non-zts-${{ matrix.series }}/openswoole-22.1.0
+          set -e
+          for VERSION in ${{ join(matrix.series.openswoole, ' ') }}; do
+            ./scripts/build-extension.sh ${{ matrix.stack.name }} ${{ matrix.series.php }} ${{ matrix.series.version }} openswoole "$VERSION" "php-${{ matrix.series.php }}.*" ${{ matrix.stack.prefix }} true
+          done

.github/workflows/mkrepo.yml

@@ -9,6 +9,11 @@ on:
       - main
     types:
       - completed
+  workflow_call:
+    inputs:
+      S3_PREFIX:
+        type: string
+        default: ""
 
 jobs:
 
@@ -22,16 +27,28 @@ jobs:
     strategy:
       matrix:
         stack:
-          - heroku-20
-          - heroku-22
+          - name: "heroku-22"
+            stable: "dist-heroku-22-stable/"
+            develop: "dist-heroku-22-develop/"
+            os: "ubuntu-latest"
+          - name: "heroku-24"
+            stable: "dist-heroku-24-amd64-stable/"
+            develop: "dist-heroku-24-amd64-develop/"
+            os: "ubuntu-latest"
+          - name: "heroku-24"
+            stable: "dist-heroku-24-arm64-stable/"
+            develop: "dist-heroku-24-arm64-develop/"
+            os: "ubuntu-24.04-arm"
 
     env:
-      S3_BUCKET: heroku-php-extensions
+      S3_BUCKET: ${{ secrets.S3_BUCKET || 'heroku-php-extensions' }}
+      S3_REGION: ${{ secrets.S3_REGION || '' }}
+      S3_PREFIX: ${{ inputs.S3_PREFIX || matrix.stack.develop }}
       BUILDPACK: ./vendor/heroku/heroku-buildpack-php
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Composer Install
         run: composer install --prefer-dist --no-progress --no-suggest --ignore-platform-reqs
@@ -40,19 +57,16 @@ jobs:
         run: cp ${BUILDPACK}/requirements.txt .
 
       - name: Build Dockerfile
-        run: |
-          cat ${BUILDPACK}/support/build/_docker/${{ matrix.stack }}.Dockerfile > docker/build/${{ matrix.stack }}.Dockerfile
-          cat docker/${{ matrix.stack }}.Dockerfile >> docker/build/${{ matrix.stack }}.Dockerfile
-
+        run: ./scripts/create-dockerfile.sh ${{ matrix.stack.name }}
+
       - name: Docker build
-        run: docker build --pull --tag ${{ matrix.stack }} --file docker/build/${{ matrix.stack }}.Dockerfile .
+        run: ./scripts/build-dockerfile.sh ${{ matrix.stack.name }}
 
       - name: Make and upload repository
-        shell: 'script -q -e -c "bash {0}"'
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         run: |
-          docker run --rm -ti \
+          docker run --rm \
             --env-file=${BUILDPACK}/support/build/_docker/env.default \
-            ${{ matrix.stack }} mkrepo.sh --upload
+            ${{ matrix.stack.name }} mkrepo.sh --upload