Add support for PHP 8.3

.github/workflows/build-lxd.yml

@@ -362,7 +362,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
         with:
-          ref: "${{ env.VERSION }}"
+          ref: "v1.54.3"
       - name: Setup Firefox
         continue-on-error: true
         id: setup-firefox-browser-action
@@ -422,7 +422,7 @@ jobs:
             sudo "$LXC" exec ncp -- "tail -n20 /var/log/ncp.log" || true
             exit 1
           }
-          python nextcloud_tests.py --no-gui --skip-release-check "nextcloudpi.local" 443 4443 || {
+          python nextcloud_tests.py --skip-release-check --no-gui "nextcloudpi.local" 443 4443 || {
             echo "Nextcloud test failed!"
             echo "Geckodriver logs:"
             tail -n 20 geckodriver.log >&2 || true
@@ -457,7 +457,7 @@ jobs:
           echo "Running update to ${VERSION}"
 
           current_nc_version="$(sudo "$LXC" exec ncp -- ncc status | grep "version:" | awk '{ print $3 }')"
-          latest_nc_version="$(cat etc/ncp.cfg | jq -r '.nextcloud_version')"
+          latest_nc_version="27.0.1"
 
           sudo "$LXC" exec ncp -- bash -c "DBG=x ncp-update ${UPDATE_ARGS[*]}"
           sudo "$LXC" exec ncp -- /usr/local/bin/ncc status
@@ -467,6 +467,7 @@ jobs:
             echo "Nextcloud is up to date - skipping NC update test."
           else
             sudo "$LXC" exec ncp -- bash -c "DBG=x ncp-update-nc ${latest_nc_version?}"
+            sudo "$LXC" exec ncp -- /usr/local/bin/ncc status
           fi
 
           sudo "$LXC" exec ncp -- rm -f /opt/ncdata/data/nextcloud.log
@@ -506,6 +507,10 @@ jobs:
             echo "System test failed!"
             exit 1
           }
+      - name: Checkout current version
+        run: |
+          git fetch origin
+          git checkout "${{ env.VERSION }}"
       - name: NCP distupgrade
         id: distupgrade
         run: |
@@ -514,7 +519,21 @@ jobs:
             echo "can't upgrade from Debian $(sudo "$LXC" exec ncp -- cat /etc/os-release | grep VERSION_ID=)"
             exit 1
           }
+          current_nc_version="$(sudo "$LXC" exec ncp -- ncc status | grep "version:" | awk '{ print $3 }')"
+          latest_nc_version="$(cat etc/ncp.cfg | jq -r '.nextcloud_version')"
+
           sudo "$LXC" exec ncp -- bash -c "DEBIAN_FRONTEND=noninteractive ncp-dist-upgrade"
+          sudo "$LXC" exec ncp -- /usr/local/bin/ncc status
+
+          if [[ "$current_nc_version" =~ "$latest_nc_version".* ]]
+          then
+            echo "Nextcloud is up to date - skipping NC update test."
+          else
+            sudo "$LXC" exec ncp -- bash -c "DBG=x ncp-update-nc ${latest_nc_version?}"
+            sudo "$LXC" exec ncp -- /usr/local/bin/ncc status
+          fi
+
+          sudo "$LXC" exec ncp -- rm -f /opt/ncdata/data/nextcloud.log
 
           sudo "$LXC" exec ncp -- rm -f /opt/ncdata/data/nextcloud.log
 

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

@@ -191,9 +191,9 @@ jobs:
           echo '[Service]' | sudo tee raspbian_root/etc/systemd/system/redis-server.service.d/ncp.conf
           echo 'PrivateUsers=false' | sudo tee -a raspbian_root/etc/systemd/system/redis-server.service.d/ncp.conf
 
-          sudo mkdir -p raspbian_root/etc/systemd/system/php8.1-fpm.service.d
-          echo '[Service]' | sudo tee raspbian_root/etc/systemd/system/php8.1-fpm.service.d/ncp.conf
-          echo 'ExecStartPre=mkdir -p /var/run/php' | sudo tee -a raspbian_root/etc/systemd/system/php8.1-fpm.service.d/ncp.conf
+          sudo mkdir -p raspbian_root/etc/systemd/system/php8.2-fpm.service.d
+          echo '[Service]' | sudo tee raspbian_root/etc/systemd/system/php8.2-fpm.service.d/ncp.conf
+          echo 'ExecStartPre=mkdir -p /var/run/php' | sudo tee -a raspbian_root/etc/systemd/system/php8.2-fpm.service.d/ncp.conf
       - name: Test image
         id: test
         run: |

.github/workflows/release.yml

@@ -324,6 +324,12 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+
+          NC_VERSION="$(jq -r '.nextcloud_version' < etc/ncp.cfg)"
+          PHP_VERSION="$(jq -r '.php_version' < etc/ncp.cfg)"
+          DEBIAN_VERSION="$(jq -r '.release' < etc/ncp.cfg)"
+          ARMBIAN_VERSIOn="$(cat build/armbian/armbian_version)"
+
           subject="$(git tag -n10 --format="%(contents:subject)" "${{ env.VERSION }}")"
           body="$(git tag -n30 --format="%(contents:body)" "${{ env.VERSION }}")"
           separator="
@@ -334,6 +340,12 @@ jobs:
 
           gh release create --draft -F - "${{ env.VERSION }}" <<EOF
           ${subject:-No message found}
+
+          ### Included Software
+          Nextcloud ${NC_VERSION} (can be automatically updated to latest minor version) 
+          PHP ${PHP_VERSION}
+          Debian ${DEBIAN_VERSION}
+          Armbian ${ARMBIAN_VERSION}
 
           ${body:+${body}${separator}}
 

README.md

@@ -43,7 +43,7 @@ Please reach out in the [Matrix][chat-matrix-wiki] or [Telegram][chat-telegram-w
 
 ## Features
 
- * Raspberry Pi OS/Debian 11 _(Bullseye)_
+ * Raspberry Pi OS/Debian 12 _(Bookworm)_
  * Nextcloud
  * Apache, with HTTP2 enabled
  * PHP 8.1