consolidate and remove tests for now

.github/workflows/build-php-images.yml

@@ -3,9 +3,9 @@ name: Build PHP Images
 on:
   # Uncomment below for testing purposes
   pull_request:
-  release:
-    types:
-      - published
+  push:
+    branches:
+      - main
 
 jobs:
   buildx:
@@ -86,7 +86,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
       - name: Set tag suffix
         id: release
-        if: ${{ github.event_name == 'release' &&  github.event.release.prerelease == 'true' }}
+        if: ${{ github.event_name == 'pull_request' }}
         run: echo "tag_suffix=-edge" >> "$GITHUB_OUTPUT"
       # Build our images.
       - name: Login to DockerHub
@@ -99,7 +99,7 @@ jobs:
         with:
           context: ${{ matrix.context }}
           platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name == 'release' }}
+          push: true
           tags: devwithlando/${{ matrix.image }}:${{ matrix.tag }}${{ steps.release.outputs.tag_suffix }}
           cache-from: type=gha
-          cache-to: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/pr-php-tests.yml

@@ -12,10 +12,10 @@ jobs:
       fail-fast: false
       matrix:
         leia-test:
-          - examples/5.6
-          - examples/7.0
-          - examples/7.1
-          - examples/7.2
+          # - examples/5.6
+          # - examples/7.0
+          # - examples/7.1
+          # - examples/7.2
           - examples/7.3
           - examples/7.4
           - examples/8.0
@@ -25,7 +25,7 @@ jobs:
           - examples/custom
           - examples/composer
           - examples/php-extensions
-          - examples/xdebug
+          # - examples/xdebug
         lando-version:
           - 3-edge-slim
         os:
@@ -57,51 +57,6 @@ jobs:
             setup.skipCommonPlugins=true
             setup.plugins.@lando/php=/home/runner/work/php/php
           telemetry: false
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Check for Dockerfiles
-        id: dockerfile
-        run: |
-          # cut out version
-          VERSION=$(echo "${{ matrix.leia-test }}" | cut -d'/' -f2)
-
-          # apache
-          if [ -f "./images/${VERSION}-apache/Dockerfile" ]; then
-            echo "apache=true" >> $GITHUB_OUTPUT
-            echo "apache-tag=${VERSION}-apache" >> $GITHUB_OUTPUT
-          else
-            echo "apache=false" >> $GITHUB_OUTPUT
-          fi
-
-          # nginx
-          if [ -f "./images/${VERSION}-fpm/Dockerfile" ]; then
-            echo "nginx=true" >> $GITHUB_OUTPUT
-            echo "nginx-tag=${VERSION}-fpm" >> $GITHUB_OUTPUT
-          else
-            echo "nginx=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Build apache image
-        uses: docker/build-push-action@v6
-        if: ${{ steps.dockerfile.outputs.apache == 'true' }}
-        with:
-          context: images/${{ steps.dockerfile.outputs.apache-tag }}
-          platforms: linux/amd64,linux/arm64
-          push: false
-          tags: devwithlando/php:${{ steps.dockerfile.outputs.apache-tag }}-4
-          cache-from: type=gha
-          cache-to: type=gha
-      - name: Build nginx image
-        uses: docker/build-push-action@v6
-        if: ${{ steps.dockerfile.outputs.nginx == 'true' }}
-        with:
-          context: images/${{ steps.dockerfile.outputs.nginx-tag }}
-          platforms: linux/amd64,linux/arm64
-          push: false
-          tags: devwithlando/php:${{ steps.dockerfile.outputs.nginx-tag }}-4
-          cache-from: type=gha
-          cache-to: type=gha
       - name: Run Leia Tests
         uses: lando/run-leia-action@v2
         with:

examples/5.6/README.md

@@ -83,6 +83,10 @@ lando exec cli -- composer --version --no-ansi | grep "Composer version 1."
 lando exec custom -- php -i | grep memory_limit | grep 514
 lando exec custom -- curl http://custom_nginx | grep html_errors | grep On | grep On
 
+# Should serve and be accessible over ssl if specified
+lando exec custom_nginx -- curl https://localhost
+lando exec custom -- curl https://custom_nginx
+
 # Should inherit overrides from its generator
 lando exec custom -- env | grep DUALBLADE | grep maxim
 lando exec custom_nginx -- env | grep DUALBLADE | grep maxim

examples/7.0/README.md

@@ -84,6 +84,10 @@ lando exec cli -- composer --version --no-ansi | grep "Composer version 1."
 lando exec custom -- php -i | grep memory_limit | grep 514
 lando exec custom -- curl http://custom_nginx | grep html_errors | grep On | grep On
 
+# Should serve and be accessible over ssl if specified
+lando exec custom_nginx -- curl https://localhost
+lando exec custom -- curl https://custom_nginx
+
 # Should inherit overrides from its generator
 lando exec custom -- env | grep DUALBLADE | grep maxim
 lando exec custom_nginx -- env | grep DUALBLADE | grep maxim

examples/7.1/README.md

@@ -84,6 +84,10 @@ lando exec cli -- composer --version --no-ansi | grep "Composer version 1."
 lando exec custom -- php -i | grep memory_limit | grep 514
 lando exec custom -- curl http://custom_nginx | grep html_errors | grep On | grep On
 
+# Should serve and be accessible over ssl if specified
+lando exec custom_nginx -- curl https://localhost
+lando exec custom -- curl https://custom_nginx
+
 # Should inherit overrides from its generator
 lando exec custom -- env | grep DUALBLADE | grep maxim
 lando exec custom_nginx -- env | grep DUALBLADE | grep maxim

examples/7.2/README.md

@@ -84,6 +84,10 @@ lando exec cli -- composer --version --no-ansi | grep "Composer version 1."
 lando exec custom -- php -i | grep memory_limit | grep 514
 lando exec custom -- curl http://custom_nginx | grep html_errors | grep On | grep On
 
+# Should serve and be accessible over ssl if specified
+lando exec custom_nginx -- curl https://localhost
+lando exec custom -- curl https://custom_nginx
+
 # Should inherit overrides from its generator
 lando exec custom -- env | grep DUALBLADE | grep maxim
 lando exec custom_nginx -- env | grep DUALBLADE | grep maxim

examples/7.3/README.md

@@ -81,6 +81,10 @@ lando exec cli -- curl http://localhost || echo $? | grep 7
 lando exec custom -- php -i | grep memory_limit | grep 514
 lando exec custom -- curl http://custom_nginx | grep html_errors | grep On | grep On
 
+# Should serve and be accessible over ssl if specified
+lando exec custom_nginx -- curl https://localhost
+lando exec custom -- curl https://custom_nginx
+
 # Should inherit overrides from its generator
 lando exec custom -- env | grep DUALBLADE | grep maxim
 lando exec custom_nginx -- env | grep DUALBLADE | grep maxim

examples/7.4/README.md

@@ -81,6 +81,10 @@ lando exec cli -- curl http://localhost || echo $? | grep 7
 lando exec custom -- php -i | grep memory_limit | grep 514
 lando exec custom -- curl http://custom_nginx | grep html_errors | grep On | grep On
 
+# Should serve and be accessible over ssl if specified
+lando exec custom_nginx -- curl https://localhost
+lando exec custom -- curl https://custom_nginx
+
 # Should inherit overrides from its generator
 lando exec custom -- env | grep DUALBLADE | grep maxim
 lando exec custom_nginx -- env | grep DUALBLADE | grep maxim

examples/8.0/README.md

@@ -84,6 +84,10 @@ lando exec cli -- composer --version --no-ansi | grep "Composer version 2."
 lando exec custom -- php -i | grep memory_limit | grep 514
 lando exec custom -- curl http://custom_nginx | grep html_errors | grep On | grep On
 
+# Should serve and be accessible over ssl if specified
+lando exec custom_nginx -- curl https://localhost
+lando exec custom -- curl https://custom_nginx
+
 # Should inherit overrides from its generator
 lando exec custom -- env | grep DUALBLADE | grep maxim
 lando exec custom_nginx -- env | grep DUALBLADE | grep maxim

examples/8.1/README.md

@@ -84,6 +84,10 @@ lando exec cli -- composer --version --no-ansi | grep "Composer version 2."
 lando exec custom -- php -i | grep memory_limit | grep 514
 lando exec custom -- curl http://custom_nginx | grep html_errors | grep On | grep On
 
+# Should serve and be accessible over ssl if specified
+lando exec custom_nginx -- curl https://localhost
+lando exec custom -- curl https://custom_nginx
+
 # Should inherit overrides from its generator
 lando exec custom -- env | grep DUALBLADE | grep maxim
 lando exec custom_nginx -- env | grep DUALBLADE | grep maxim

examples/8.2/README.md

@@ -84,6 +84,10 @@ lando exec cli -- composer --version --no-ansi | grep "Composer version 2."
 lando exec custom -- php -i | grep memory_limit | grep 514
 lando exec custom -- curl http://custom_nginx | grep html_errors | grep On | grep On
 
+# Should serve and be accessible over ssl if specified
+lando exec custom_nginx -- curl https://localhost
+lando exec custom -- curl https://custom_nginx
+
 # Should inherit overrides from its generator
 lando exec custom -- env | grep DUALBLADE | grep maxim
 lando exec custom_nginx -- env | grep DUALBLADE | grep maxim

examples/8.3/README.md

@@ -84,6 +84,10 @@ lando exec cli -- composer --version --no-ansi | grep "Composer version 2."
 lando exec custom -- php -i | grep memory_limit | grep 514
 lando exec custom -- curl http://custom_nginx | grep html_errors | grep On | grep On
 
+# Should serve and be accessible over ssl if specified
+lando exec custom_nginx -- curl https://localhost
+lando exec custom -- curl https://custom_nginx
+
 # Should inherit overrides from its generator
 lando exec custom -- env | grep DUALBLADE | grep maxim
 lando exec custom_nginx -- env | grep DUALBLADE | grep maxim