diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index adc0084a..98fc9a95 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -381,7 +381,7 @@ jobs: docker exec nextcloudpi bash /usr/local/bin/ncp-diag |& awk "{ print \"${LOG_DIAG} \" \$0 }" - name: "Upload error report" if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ github.run_id }}-docker-${{ env.ARCH }}-update-test-error-report path: tests/error-report.txt @@ -533,7 +533,7 @@ jobs: - name: "Upload error report" if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ github.run_id }}-docker-${{ env.ARCH }}-install-test-error-report path: tests/error-report.txt diff --git a/.github/workflows/build-lxd.yml b/.github/workflows/build-lxd.yml index c5b2992a..f16e07b4 100644 --- a/.github/workflows/build-lxd.yml +++ b/.github/workflows/build-lxd.yml @@ -91,7 +91,7 @@ jobs: sudo "$LXC" image export -q ncp/"${version}" "output/${ARTIFACT_FILE}" echo "artifact_file=${ARTIFACT_FILE}.tar.gz" >> $GITHUB_OUTPUT - name: upload LXD image to artifact store - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "${{ env.ARTIFACT_NAME }}" path: "output/${{ steps.pack-lxd.outputs.artifact_file }}" @@ -639,7 +639,7 @@ jobs: - name: Setup Selenium run: pip install selenium - name: download LXD image from artifact store - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ env.ARTIFACT_NAME }} - name: Remove old lxd images @@ -668,18 +668,18 @@ jobs: - name: Test LXD Image working-directory: ./tests run: | - "$LXC" exec ncp -- bash -c 'tail -f /var/log/ncp.log' |& awk '{ print "NCP::" $0 }' & + sudo "$LXC" exec ncp -- bash -c 'tail -f /var/log/ncp.log' |& awk '{ print "NCP::" $0 }' & python activation_tests.py --no-gui "nextcloudpi.local" 443 4443 || { echo "Activation test failed!" echo "Geckodriver logs:" tail -n 20 geckodriver.log >&2 || true echo "================" echo "ncp.log: " - "$LXC" exec ncp -- "tail -n20 /var/log/ncp.log" || true + sudo "$LXC" exec ncp -- "tail -n20 /var/log/ncp.log" || true echo "================" echo "nextcloud log: " datadir="$("$LXC" exec ncp -- ncc config:system:get datadirectory)" - "$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true + sudo "$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true exit 1 } python nextcloud_tests.py --no-gui "nextcloudpi.local" 443 4443 || { @@ -688,11 +688,11 @@ jobs: tail -n 20 geckodriver.log >&2 || true echo "================" echo "ncp.log: " - "$LXC" exec ncp -- "tail -n20 /var/log/ncp.log" || true + sudo "$LXC" exec ncp -- "tail -n20 /var/log/ncp.log" || true echo "================" echo "nextcloud log: " - datadir="$("$LXC" exec ncp -- ncc config:system:get datadirectory)" - "$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true + datadir="$(sudo "$LXC" exec ncp -- ncc config:system:get datadirectory)" + sudo "$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true exit 1 } USE_INCUS="$USE_INCUS" python system_tests.py --non-interactive || { @@ -714,7 +714,7 @@ jobs: LXD_ARTIFACT_FILE: ${{ needs.build-current.outputs.artifact_file }} steps: - name: download LXD image from artifact store - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ env.LXD_ARTIFACT_NAME }} - name: convert to LXC image @@ -732,7 +732,7 @@ jobs: echo "artifact_file=${LXC_ARTIFACT_FILE?}" >> $GITHUB_OUTPUT; echo "artifact_name=${LXD_ARTIFACT_NAME//lxd/lxc}" >> $GITHUB_OUTPUT; - name: upload LXD image to artifact store - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "${{ steps.lxd-to-lxc.outputs.artifact_name }}" path: "output/${{ steps.lxd-to-lxc.outputs.artifact_file }}" diff --git a/.github/workflows/build-sd-images.yml b/.github/workflows/build-sd-images.yml index 12a4490d..caa2afaf 100644 --- a/.github/workflows/build-sd-images.yml +++ b/.github/workflows/build-sd-images.yml @@ -98,12 +98,12 @@ jobs: echo "ARTIFACT_FILE=${IMG}" >> $GITHUB_ENV - name: "Upload Armbian logs" if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ github.run_id }}-${{ inputs.board_id }}-logs path: armbian/output - name: upload image to artifact store - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ github.run_id }}-${{ inputs.board_id }}-image path: output/${{ env.ARTIFACT_FILE }} @@ -134,7 +134,7 @@ jobs: uses: actions/checkout@v3 with: ref: "${{ env.VERSION }}" - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: ${{ env.ARTIFACT_ID }} path: output diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml index 49a083e8..925c66cd 100644 --- a/.github/workflows/publish-image.yml +++ b/.github/workflows/publish-image.yml @@ -32,7 +32,7 @@ jobs: with: ref: "${{ env.VERSION }}" - name: "Download artifact" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ inputs.artifact_id }} path: artifacts diff --git a/.github/workflows/vm-tests.yml b/.github/workflows/vm-tests.yml index a6cf114a..09e1121d 100644 --- a/.github/workflows/vm-tests.yml +++ b/.github/workflows/vm-tests.yml @@ -52,7 +52,7 @@ jobs: ssh-keygen -t ed25519 -f ".ssh/automation_ssh_key" . /ncp-test-automation/bin/entrypoint.sh - name: upload ssh private key to artifact store - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "${{ env.SSH_ARTIFACT_NAME }}" path: /__w/nextcloudpi/nextcloudpi/.ssh @@ -302,7 +302,7 @@ jobs: ssh-keygen -t ed25519 -f "/__w/nextcloudpi/nextcloudpi/.ssh/automation_ssh_key" . /ncp-test-automation/bin/entrypoint.sh - name: upload ssh private key to artifact store - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "${{ env.SSH_ARTIFACT_NAME }}" path: /__w/nextcloudpi/nextcloudpi/.ssh @@ -514,7 +514,7 @@ jobs: UID: ${{ github.run_id }}-install steps: - name: download ssh private key from artifact store - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 if: ${{ contains('success|failure', env.TEST_RESULT) }} with: name: ${{ env.SSH_ARTIFACT_NAME }} @@ -621,7 +621,7 @@ jobs: SSH_ARTIFACT_NAME: "${{ needs.dist-upgrade-test.outputs.ssh_artifact_name }}" steps: - name: download ssh private key from artifact store - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 if: ${{ contains('success|failure', env.TEST_RESULT) }} with: name: ${{ env.SSH_ARTIFACT_NAME }} diff --git a/etc/library.sh b/etc/library.sh index 1f031ca3..2d41465a 100644 --- a/etc/library.sh +++ b/etc/library.sh @@ -22,7 +22,7 @@ export DB_PREFIX="$(php -r 'include("/var/www/nextcloud/config/config.php"); ech export SYSTEMD_PAGER= [[ -f "$NCPCFG" ]] || export NCPCFG=/usr/local/etc/ncp.cfg -[[ -f "$NCPCFG" ]] || { echo "$NCPCFG not found" >2; exit 1; } +[[ -f "$NCPCFG" ]] || { echo "$NCPCFG not found" >&2; exit 1; } if [[ "$(ps -p 1 --no-headers -o "%c")" == "systemd" ]] && ! [[ -d "/run/systemd/system" ]] then diff --git a/etc/ncp-config.d/nc-nextcloud.cfg b/etc/ncp-config.d/nc-nextcloud.cfg index 3bf03675..aaa39fb9 100644 --- a/etc/ncp-config.d/nc-nextcloud.cfg +++ b/etc/ncp-config.d/nc-nextcloud.cfg @@ -9,7 +9,7 @@ { "id": "VER", "name": "Version", - "value": "30.0.1" + "value": "31.0.2" }, { "id": "MAXFILESIZE", diff --git a/etc/ncp.cfg b/etc/ncp.cfg index af87f23a..5c30ba3d 100644 --- a/etc/ncp.cfg +++ b/etc/ncp.cfg @@ -1,5 +1,5 @@ { - "nextcloud_version": "30.0.1", + "nextcloud_version": "31.0.2", "php_version": "8.3", "release": "bookworm" } diff --git a/ncp-app/appinfo/info.xml b/ncp-app/appinfo/info.xml index 1fe88071..a3040d3a 100644 --- a/ncp-app/appinfo/info.xml +++ b/ncp-app/appinfo/info.xml @@ -12,7 +12,7 @@ tools https://github.com/nextcloud/nextcloudpi/issues - + diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/appinfo/info.xml b/ncp-previewgenerator/ncp-previewgenerator-nc21/appinfo/info.xml index 46b4ed51..e7a25109 100644 --- a/ncp-previewgenerator/ncp-previewgenerator-nc21/appinfo/info.xml +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/appinfo/info.xml @@ -25,7 +25,7 @@ The first time you install this app, before using a cron job, you properly want - + diff --git a/updates/1.55.3.sh b/updates/1.55.3.sh index 78ea8436..3464edee 100644 --- a/updates/1.55.3.sh +++ b/updates/1.55.3.sh @@ -1,3 +1,3 @@ #!/bin/bash -[ -f /etc/cron.d/ncp-previews-auto ] && mv /etc/cron.d/ncp-previews-auto /etc/cron.d/nc-previews-auto +! [ -f /etc/cron.d/ncp-previews-auto ] || mv /etc/cron.d/ncp-previews-auto /etc/cron.d/nc-previews-auto diff --git a/updates/1.56.0.sh b/updates/1.56.0.sh new file mode 100755 index 00000000..d36cfc61 --- /dev/null +++ b/updates/1.56.0.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -eu -o pipefail + +echo "Update DB row format ..." +mysql -u root -N nextcloud -e "SELECT CONCAT('ALTER TABLE \`', table_name, '\` row_format=DYNAMIC;') FROM information_schema.tables WHERE table_schema = 'nextcloud' AND engine = 'InnoDB' AND row_format != 'Dynamic';" | mysql -u root nextcloud +echo "Done." +