Adjust workflow for multistage

Author: mistraloz

.github/workflows/workflow.yml

@@ -18,48 +18,42 @@ jobs:
         variant: ['apache','cli','fpm']
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout
+        uses: actions/checkout@v3
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Checkout
-        uses: actions/checkout@v1
-#      - name: Build locally
-#        run: |
-#          PHP_VERSION="${{ matrix.php_version }}"
-#          docker buildx bake --load \
-#            --set "*.platform=linux/amd64" \
-#            php${PHP_VERSION//.}-slim-${{ matrix.variant }}
-#          docker buildx bake --load \
-#            --set "*.platform=linux/amd64" \
-#            php${PHP_VERSION//.}-${{ matrix.variant }}-all
-#          PHP_VERSION_MINOR=`docker run --rm thecodingmachine/php:${PHP_VERSION}-v4-slim-cli php -v | head -n1 | grep -P '\d+\.\d+\.\d+' -o | head -n1`
-#          echo "PHP_VERSION_MINOR=${PHP_VERSION_MINOR}" >> $GITHUB_ENV
-#          echo "PHP Version : ${PHP_VERSION_MINOR}" >> $GITHUB_STEP_SUMMARY
-#          docker images --filter=reference=thecodingmachine/php >> $GITHUB_STEP_SUMMARY
-#      - name: Test ${{ matrix.variant }}
-#        run:  |
-#          PHP_VERSION="${{ matrix.php_version }}" BRANCH=v4 VARIANT=${{ matrix.variant }} ./test-image.sh
-#          echo "${{ matrix.variant }} variant OK" >> $GITHUB_STEP_SUMMARY
+        uses: docker/setup-buildx-action@v2
+      - name: Build locally (amd64)
+        run: |
+          PHP_VERSION="${{ matrix.php_version }}"
+          docker buildx bake --load \
+            --set "*.platform=linux/amd64" \
+            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: Login to DockerHub
         # Merge ~ push.
         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
+      - name: Build and push to repository (both amd64 and arm64)
         # Merge ~ push.
         if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
         run: |
           PHP_VERSION="${{ matrix.php_version }}"
-          docker buildx bake \
-            --set "*.platform=linux/amd64,linux/arm64" \
-            --set "*.output=type=registry" \
-            php${PHP_VERSION//.}-slim-${{ matrix.variant }}
-          PHP_PATCH_MINOR=`docker run --rm thecodingmachine/php:${PHP_VERSION}-v4-slim-cli php -v | head -n1 | grep -P '\d+\.\d+\.\d+' -o | head -n1` \
+          PHP_PATCH_MINOR="${{ env.PHP_VERSION_MINOR }}" \
           docker buildx bake \
             --set "*.platform=linux/amd64,linux/arm64" \
             --set "*.output=type=registry" \
             php${PHP_VERSION//.}-${{ matrix.variant }}-all
-          docker images --filter=reference=thecodingmachine/php >> $GITHUB_STEP_SUMMARY