Merge branch 'master' into fix/arch-detect

.github/workflows/cron_tests.yml

@@ -1,37 +1,42 @@
 name: "Daily tests"
 on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+  schedule:
+    - cron: "25 08 * * *"
+
   workflow_dispatch:
     inputs:
       debug_enabled:
-        type: boolean
-        description: Debug with tmate
-        required: false
-        default: false
-      ddev_version:
-        type: string
-        description: DDEV version to test
-        required: false
-        default: '["stable"]'
-      test_type:
-        type: string
-        description: Test type to run. Can be "local" or "release"
+        description: 'Debug with tmate set "debug_enabled"'
         required: false
-        default: "release"
-  schedule:
-    - cron: "25 08 * * *"
+        default: "false"
+
+env:
+  # Allow ddev get to use a github token to prevent rate limiting by tests
+  DDEV_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+# Required permissions for keep-alive, used by ddev/github-action-add-on-test
+permissions:
+  actions: write
 
 jobs:
-  run_tests:
-    name: Run tests
-    uses: oblakstudio/ddev-ioncube/.github/workflows/reusable_test_ddev_addon.yml@master
-    with:
-      ddev_version: '["stable", "HEAD", "edge"]'
-      test_type: "release"
-  keep-the-job-alive:
-    name: Keep the job alive
+  tests:
+    strategy:
+      matrix:
+        ddev_version: [stable, HEAD]
+      fail-fast: false
+
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v4
-      - uses: gautamkrishnar/[email protected]
+      - uses: ddev/github-action-add-on-test@v2
         with:
-          commit_message: "chore(cron): Keepalive workflow [skip ci]"
+          ddev_version: ${{ matrix.ddev_version }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          debug_enabled: ${{ github.event.inputs.debug_enabled }}
+          addon_repository: ${{ env.GITHUB_REPOSITORY }}
+          addon_ref: ${{ env.GITHUB_REF }}

.github/workflows/pull_request.yml

@@ -1,11 +1,16 @@
 name: "Test DDEV Addon"
 on:
   pull_request:
+    paths-ignore:
+      - "README.md"
+      - ".github/workflows/*.yml"
   merge_group:
 
 jobs:
   run_tests:
     name: Run tests
-    uses: oblakstudio/ddev-ioncube/.github/workflows/reusable_test_ddev_addon.yml@master
+    uses: oblakstudio/public-workflows/.github/workflows/ddev-test_addon.yaml@v1
+    secrets: inherit
     with:
       test_type: "local"
+      os: '["ubuntu-latest"]'

.github/workflows/release.yml

@@ -15,13 +15,13 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          token: ${{ secrets.OBLAK_BOT_TOKEN }}
+          token: ${{ secrets.OBLAKBOT_PAT }}
       - name: Import GPG keys
         uses: crazy-max/ghaction-import-gpg@v6
         id: gpg
         with:
-          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          gpg_private_key: ${{ secrets.OBLAKBOT_GPG_KEY }}
+          passphrase: ${{ secrets.OBLAKBOT_GPG_PASS }}
           git_config_global: true
           git_user_signingkey: true
           git_commit_gpgsign: true
@@ -32,8 +32,4 @@ jobs:
             @semantic-release/github
             @semantic-release/exec
         env:
-          GIT_AUTHOR_NAME: ${{ steps.gpg.outputs.name}}
-          GIT_AUTHOR_EMAIL: ${{ steps.gpg.outputs.email}}
-          GIT_COMMITTER_NAME: ${{ steps.gpg.outputs.name}}
-          GIT_COMMITTER_EMAIL: ${{ steps.gpg.outputs.email}}
-          GITHUB_TOKEN: ${{ secrets.OBLAK_BOT_TOKEN }}
+          token: ${{ secrets.OBLAKBOT_PAT }}

web-build/ioncube/modify-dockerfile.sh

@@ -35,7 +35,7 @@ remove_directives() {
 
 add_directives() {
 	local FILE_PATH="$1"
-	local PHP_VERSIONS=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.1" "8.2")
+	local PHP_VERSIONS=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.1" "8.2" "8.3")
 
 	cat <<EOF >>"$FILE_PATH"
 # BEGIN IonCube Install