Gitlab ci Test and build for multiarch

Author: mistraloz

.github/workflows/workflow.yml

@@ -12,46 +12,63 @@ on:
 
 jobs:
   build_test_maybe_release:
+    runs-on: ubuntu-latest
     strategy:
+      fail-fast: true
       matrix:
-        php_version: ['8.1','8.0','7.4', '7.3','7.2']
-        variant: ['apache','cli','fpm']
-    runs-on: ubuntu-latest
+        php_version: ['8.1'] #,'8.0','7.4', '7.3','7.2']
+        variant: ['apache'] #,'cli','fpm']
     steps:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      - name: Build locally (amd64)
+      - name: Expose GitHub Runtime for docker cache
+        uses: crazy-max/ghaction-github-runtime@v2
+      - name: Inject slug/short variables
+        uses: rlespinasse/github-slug-action@v4
+      - name: Build amd64
         run: |
           PHP_VERSION="${{ matrix.php_version }}"
-          docker buildx bake --load \
+          TAG_PREFIX="rc-${{ env.GITHUB_SHA_SHORT }}-" \
+          docker buildx bake \
+            --set "*.cache-to=type=gha" --set "*.cache-from=type=gha \
             --set "*.platform=linux/amd64" \
+            --set "*.output=type=docker" \
             php${PHP_VERSION//.}-${{ matrix.variant }}-all
-          # Fetch minor version
-          PHP_VERSION_MINOR=`docker run --rm thecodingmachine/php:${PHP_VERSION}-v4-slim-${{ matrix.variant }} php -v | head -n1 | grep -P '\d+\.\d+\.\d+' -o | head -n1`
-          echo "PHP_VERSION_MINOR=${PHP_VERSION_MINOR}" >> $GITHUB_ENV
-          # Summary
-          echo "PHP Version : ${PHP_VERSION_MINOR}" >> $GITHUB_STEP_SUMMARY
-          docker images --filter=reference=thecodingmachine/php >> $GITHUB_STEP_SUMMARY   
-          docker images --filter=reference=thecodingmachine/php
-      - name: Test variant '${{ matrix.variant }}' (amd64)
-        run:  |
-          PHP_VERSION="${{ matrix.php_version }}" BRANCH=v4 VARIANT=${{ matrix.variant }} ./tests-suite/bash_unit -f tap ./tests-suite/*.sh
+      - name: Test amd64
+        run: |
+          TAG_PREFIX="rc${{ env.GITHUB_SHA_SHORT }}-" \
+          PHP_VERSION="${{ matrix.php_version }}" BRANCH=v4 VARIANT=${{ matrix.variant }} PLATFORM=linux/amd64 ./tests-suite/bash_unit -f tap ./tests-suite/*.sh
+      - name: Build arm64
+        run: |
+          PHP_VERSION="${{ matrix.php_version }}"
+          TAG_PREFIX="rc-${{ env.GITHUB_SHA_SHORT }}-" \
+          docker buildx bake \
+            --set "*.cache-to=type=gha" --set "*.cache-from=type=gha \
+            --set "*.platform=linux/arm64" \
+            --set "*.output=type=docker" \
+            php${PHP_VERSION//.}-${{ matrix.variant }}-all
+      - name: Test arm64
+        run: |
+          TAG_PREFIX="rc-${{ env.GITHUB_SHA_SHORT }}-" \
+          PHP_VERSION="${{ matrix.php_version }}" BRANCH=v4 VARIANT=${{ matrix.variant }} PLATFORM=linux/arm64 ./tests-suite/bash_unit -f tap ./tests-suite/*.sh
       - name: Login to DockerHub
-        # Merge ~ push.
+        # push ~ schedule
         if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push to repository (both amd64 and arm64)
-        # Merge ~ push.
+      - name: Build and push as multiarch (amd64 and arm64)
+        # push ~ schedule
         if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
         run: |
+          PHP_PATCH_MINOR=`docker run --rm thecodingmachine/php:rc-${{ env.GITHUB_SHA_SHORT }}-${{ matrix.php_version }}-v4-slim-${{ matrix.variant }} php -v | head -n1 | grep -P '\d+\.\d+\.\d+' -o | head -n1`
           PHP_VERSION="${{ matrix.php_version }}"
+          TAG_PREFIX="rc-${{ env.GITHUB_SHA_SHORT }}-" \
           PHP_PATCH_MINOR="${{ env.PHP_VERSION_MINOR }}" \
           docker buildx bake \
             --set "*.platform=linux/amd64,linux/arm64" \

Dockerfile.slim.apache

@@ -52,8 +52,7 @@ RUN apt-get update \
         php${PHP_VERSION}-readline \
         php${PHP_VERSION}-xml \
         php${PHP_VERSION}-zip \
-    && if [[ "${PHP_VERSION}" =~ ^7 ]]; then apt-get install -y --no-install-recommends php${PHP_VERSION}-json; fi \
-    && if [[ "${PHP_VERSION}" =~ ^8 ]]; then apt-get install -y --no-install-recommends php${PHP_VERSION}-json; fi \
+        php${PHP_VERSION}-json \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 

Dockerfile.slim.cli

@@ -52,8 +52,7 @@ RUN apt-get update \
         php${PHP_VERSION}-readline \
         php${PHP_VERSION}-xml \
         php${PHP_VERSION}-zip \
-    && if [[ "${PHP_VERSION}" =~ ^7 ]]; then apt-get install -y --no-install-recommends php${PHP_VERSION}-json; fi \
-    && if [[ "${PHP_VERSION}" =~ ^8 ]]; then apt-get install -y --no-install-recommends php${PHP_VERSION}-json; fi \
+        php${PHP_VERSION}-json \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 

Dockerfile.slim.fpm

@@ -52,8 +52,7 @@ RUN apt-get update \
         php${PHP_VERSION}-readline \
         php${PHP_VERSION}-xml \
         php${PHP_VERSION}-zip \
-    && if [[ "${PHP_VERSION}" =~ ^7 ]]; then apt-get install -y --no-install-recommends php${PHP_VERSION}-json; fi \
-    && if [[ "${PHP_VERSION}" =~ ^8 ]]; then apt-get install -y --no-install-recommends php${PHP_VERSION}-json; fi \
+        php${PHP_VERSION}-json \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 

extensions/core/swoole/install.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+exit 0 # disable swoole as hotfix
 set -e
 export DEPENDENCIES="zlib1g"
 EXTENSION=swoole ../docker-install.sh

utils/Dockerfile.slim.blueprint

@@ -51,8 +51,7 @@ RUN apt-get update \
         php${PHP_VERSION}-readline \
         php${PHP_VERSION}-xml \
         php${PHP_VERSION}-zip \
-    && if [[ "${PHP_VERSION}" =~ ^7 ]]; then apt-get install -y --no-install-recommends php${PHP_VERSION}-json; fi \
-    && if [[ "${PHP_VERSION}" =~ ^8 ]]; then apt-get install -y --no-install-recommends php${PHP_VERSION}-json; fi \
+        php${PHP_VERSION}-json \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*