merged upstream

BlackflySolutions · Apr 16, 2024 · c7ff495 · c7ff495
2 parents 895fbb1 + 57f165b
commit c7ff495
Show file tree

Hide file tree

Showing 39 changed files with 301 additions and 114 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,13 +3,21 @@ name: GitHub CI
 on:
   pull_request:
   push:
+  workflow_dispatch:
   schedule:
     - cron: 0 0 * * 0
 
 defaults:
   run:
     shell: 'bash -Eeuo pipefail -x {0}'
 
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
 jobs:
 
   generate-jobs:
@@ -24,8 +32,11 @@ jobs:
         name: Generate Jobs
         run: |
           strategy="$("$BASHBREW_SCRIPTS/github-actions/generate.sh")"
-          echo "strategy=$strategy" >> "$GITHUB_OUTPUT"
-          jq . <<<"$strategy" # sanity check / debugging aid
+
+          EOF="EOF-$RANDOM-$RANDOM-$RANDOM"
+          echo "strategy<<$EOF" >> "$GITHUB_OUTPUT"
+          jq <<<"$strategy" . | tee -a "$GITHUB_OUTPUT"
+          echo "$EOF" >> "$GITHUB_OUTPUT"
 
   test:
     needs: generate-jobs

diff --git a/10.1/php8.1/apache-bookworm/Dockerfile b/10.1/php8.1/apache-bookworm/Dockerfile
diff --git a/10.1/php8.1/apache-bullseye/Dockerfile b/10.1/php8.1/apache-bullseye/Dockerfile
diff --git a/10.1/php8.1/fpm-alpine3.18/Dockerfile b/10.1/php8.1/fpm-alpine3.18/Dockerfile
diff --git a/10.1/php8.1/fpm-alpine3.19/Dockerfile b/10.1/php8.1/fpm-alpine3.19/Dockerfile
diff --git a/10.1/php8.1/fpm-bookworm/Dockerfile b/10.1/php8.1/fpm-bookworm/Dockerfile
diff --git a/10.1/php8.1/fpm-bullseye/Dockerfile b/10.1/php8.1/fpm-bullseye/Dockerfile
diff --git a/10.1/php8.2/apache-bookworm/Dockerfile b/10.1/php8.2/apache-bookworm/Dockerfile
diff --git a/10.1/php8.2/apache-bullseye/Dockerfile b/10.1/php8.2/apache-bullseye/Dockerfile
diff --git a/10.1/php8.2/fpm-alpine3.18/Dockerfile b/10.1/php8.2/fpm-alpine3.18/Dockerfile
diff --git a/10.1/php8.2/fpm-alpine3.19/Dockerfile b/10.1/php8.2/fpm-alpine3.19/Dockerfile
diff --git a/10.1/php8.2/fpm-bookworm/Dockerfile b/10.1/php8.2/fpm-bookworm/Dockerfile
diff --git a/10.1/php8.2/fpm-bullseye/Dockerfile b/10.1/php8.2/fpm-bullseye/Dockerfile
diff --git a/10.2/php8.2/apache-bookworm/Dockerfile b/10.2/php8.2/apache-bookworm/Dockerfile
diff --git a/10.2/php8.2/apache-bullseye/Dockerfile b/10.2/php8.2/apache-bullseye/Dockerfile
diff --git a/10.2/php8.2/fpm-alpine3.18/Dockerfile b/10.2/php8.2/fpm-alpine3.18/Dockerfile
diff --git a/10.2/php8.2/fpm-alpine3.19/Dockerfile b/10.2/php8.2/fpm-alpine3.19/Dockerfile
diff --git a/10.2/php8.2/fpm-bookworm/Dockerfile b/10.2/php8.2/fpm-bookworm/Dockerfile