Skip to content

Commit 2ada653

Browse files
theCalcaholictheCalcaholic
authored
Merge pull request #2044 from nextcloud/devel
Support for NC 31 + Fixes
2 parents 77763af + a7cf5a2 commit 2ada653

File tree

15 files changed

+48
-29
lines changed

15 files changed

+48
-29
lines changed

‎.github/workflows/build-docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ jobs:
381381
docker exec nextcloudpi bash /usr/local/bin/ncp-diag |& awk "{ print \"${LOG_DIAG} \" \$0 }"
382382
- name: "Upload error report"
383383
if: ${{ failure() }}
384-
uses: actions/upload-artifact@v3
384+
uses: actions/upload-artifact@v4
385385
with:
386386
name: ${{ github.run_id }}-docker-${{ env.ARCH }}-update-test-error-report
387387
path: tests/error-report.txt
@@ -533,7 +533,7 @@ jobs:
533533
534534
- name: "Upload error report"
535535
if: ${{ failure() }}
536-
uses: actions/upload-artifact@v3
536+
uses: actions/upload-artifact@v4
537537
with:
538538
name: ${{ github.run_id }}-docker-${{ env.ARCH }}-install-test-error-report
539539
path: tests/error-report.txt

‎.github/workflows/build-lxd.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
sudo "$LXC" image export -q ncp/"${version}" "output/${ARTIFACT_FILE}"
9292
echo "artifact_file=${ARTIFACT_FILE}.tar.gz" >> $GITHUB_OUTPUT
9393
- name: upload LXD image to artifact store
94-
uses: actions/upload-artifact@v3
94+
uses: actions/upload-artifact@v4
9595
with:
9696
name: "${{ env.ARTIFACT_NAME }}"
9797
path: "output/${{ steps.pack-lxd.outputs.artifact_file }}"
@@ -639,7 +639,7 @@ jobs:
639639
- name: Setup Selenium
640640
run: pip install selenium
641641
- name: download LXD image from artifact store
642-
uses: actions/download-artifact@v3
642+
uses: actions/download-artifact@v4
643643
with:
644644
name: ${{ env.ARTIFACT_NAME }}
645645
- name: Remove old lxd images
@@ -668,18 +668,18 @@ jobs:
668668
- name: Test LXD Image
669669
working-directory: ./tests
670670
run: |
671-
"$LXC" exec ncp -- bash -c 'tail -f /var/log/ncp.log' |& awk '{ print "NCP::" $0 }' &
671+
sudo "$LXC" exec ncp -- bash -c 'tail -f /var/log/ncp.log' |& awk '{ print "NCP::" $0 }' &
672672
python activation_tests.py --no-gui "nextcloudpi.local" 443 4443 || {
673673
echo "Activation test failed!"
674674
echo "Geckodriver logs:"
675675
tail -n 20 geckodriver.log >&2 || true
676676
echo "================"
677677
echo "ncp.log: "
678-
"$LXC" exec ncp -- "tail -n20 /var/log/ncp.log" || true
678+
sudo "$LXC" exec ncp -- "tail -n20 /var/log/ncp.log" || true
679679
echo "================"
680680
echo "nextcloud log: "
681681
datadir="$("$LXC" exec ncp -- ncc config:system:get datadirectory)"
682-
"$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true
682+
sudo "$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true
683683
exit 1
684684
}
685685
python nextcloud_tests.py --no-gui "nextcloudpi.local" 443 4443 || {
@@ -688,11 +688,11 @@ jobs:
688688
tail -n 20 geckodriver.log >&2 || true
689689
echo "================"
690690
echo "ncp.log: "
691-
"$LXC" exec ncp -- "tail -n20 /var/log/ncp.log" || true
691+
sudo "$LXC" exec ncp -- "tail -n20 /var/log/ncp.log" || true
692692
echo "================"
693693
echo "nextcloud log: "
694-
datadir="$("$LXC" exec ncp -- ncc config:system:get datadirectory)"
695-
"$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true
694+
datadir="$(sudo "$LXC" exec ncp -- ncc config:system:get datadirectory)"
695+
sudo "$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true
696696
exit 1
697697
}
698698
USE_INCUS="$USE_INCUS" python system_tests.py --non-interactive || {
@@ -714,7 +714,7 @@ jobs:
714714
LXD_ARTIFACT_FILE: ${{ needs.build-current.outputs.artifact_file }}
715715
steps:
716716
- name: download LXD image from artifact store
717-
uses: actions/download-artifact@v3
717+
uses: actions/download-artifact@v4
718718
with:
719719
name: ${{ env.LXD_ARTIFACT_NAME }}
720720
- name: convert to LXC image
@@ -732,7 +732,7 @@ jobs:
732732
echo "artifact_file=${LXC_ARTIFACT_FILE?}" >> $GITHUB_OUTPUT;
733733
echo "artifact_name=${LXD_ARTIFACT_NAME//lxd/lxc}" >> $GITHUB_OUTPUT;
734734
- name: upload LXD image to artifact store
735-
uses: actions/upload-artifact@v3
735+
uses: actions/upload-artifact@v4
736736
with:
737737
name: "${{ steps.lxd-to-lxc.outputs.artifact_name }}"
738738
path: "output/${{ steps.lxd-to-lxc.outputs.artifact_file }}"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ jobs:
9898
echo "ARTIFACT_FILE=${IMG}" >> $GITHUB_ENV
9999
- name: "Upload Armbian logs"
100100
if: ${{ failure() }}
101-
uses: actions/upload-artifact@v3
101+
uses: actions/upload-artifact@v4
102102
with:
103103
name: ${{ github.run_id }}-${{ inputs.board_id }}-logs
104104
path: armbian/output
105105
- name: upload image to artifact store
106-
uses: actions/upload-artifact@v3
106+
uses: actions/upload-artifact@v4
107107
with:
108108
name: ${{ github.run_id }}-${{ inputs.board_id }}-image
109109
path: output/${{ env.ARTIFACT_FILE }}
@@ -134,7 +134,7 @@ jobs:
134134
uses: actions/checkout@v3
135135
with:
136136
ref: "${{ env.VERSION }}"
137-
- uses: actions/download-artifact@v3
137+
- uses: actions/download-artifact@v4
138138
with:
139139
name: ${{ env.ARTIFACT_ID }}
140140
path: output

‎.github/workflows/publish-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
with:
3333
ref: "${{ env.VERSION }}"
3434
- name: "Download artifact"
35-
uses: actions/download-artifact@v3
35+
uses: actions/download-artifact@v4
3636
with:
3737
name: ${{ inputs.artifact_id }}
3838
path: artifacts

‎.github/workflows/vm-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
ssh-keygen -t ed25519 -f ".ssh/automation_ssh_key"
5353
. /ncp-test-automation/bin/entrypoint.sh
5454
- name: upload ssh private key to artifact store
55-
uses: actions/upload-artifact@v3
55+
uses: actions/upload-artifact@v4
5656
with:
5757
name: "${{ env.SSH_ARTIFACT_NAME }}"
5858
path: /__w/nextcloudpi/nextcloudpi/.ssh
@@ -302,7 +302,7 @@ jobs:
302302
ssh-keygen -t ed25519 -f "/__w/nextcloudpi/nextcloudpi/.ssh/automation_ssh_key"
303303
. /ncp-test-automation/bin/entrypoint.sh
304304
- name: upload ssh private key to artifact store
305-
uses: actions/upload-artifact@v3
305+
uses: actions/upload-artifact@v4
306306
with:
307307
name: "${{ env.SSH_ARTIFACT_NAME }}"
308308
path: /__w/nextcloudpi/nextcloudpi/.ssh
@@ -514,7 +514,7 @@ jobs:
514514
UID: ${{ github.run_id }}-install
515515
steps:
516516
- name: download ssh private key from artifact store
517-
uses: actions/download-artifact@v3
517+
uses: actions/download-artifact@v4
518518
if: ${{ contains('success|failure', env.TEST_RESULT) }}
519519
with:
520520
name: ${{ env.SSH_ARTIFACT_NAME }}
@@ -621,7 +621,7 @@ jobs:
621621
SSH_ARTIFACT_NAME: "${{ needs.dist-upgrade-test.outputs.ssh_artifact_name }}"
622622
steps:
623623
- name: download ssh private key from artifact store
624-
uses: actions/download-artifact@v3
624+
uses: actions/download-artifact@v4
625625
if: ${{ contains('success|failure', env.TEST_RESULT) }}
626626
with:
627627
name: ${{ env.SSH_ARTIFACT_NAME }}

‎bin/ncp/CONFIG/nc-datadir.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ configure()
135135
create_tmp_upload_dir
136136
ncc config:system:set tempdirectory --value "$DATADIR/tmp" \
137137
|| sed -i "s|'tempdirectory' =>.*|'tempdirectory' => '${DATADIR}/tmp',|" "${NCDIR?}"/config/config.php
138-
sed -i "s|^;\?upload_tmp_dir =.*$|uploadtmp_dir = ${DATADIR}/tmp|" /etc/php/"${PHPVER?}"/cli/php.ini
138+
sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = ${DATADIR}/tmp|" /etc/php/"${PHPVER?}"/cli/php.ini
139139
sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = ${DATADIR}/tmp|" /etc/php/"${PHPVER}"/fpm/php.ini
140140
sed -i "s|^;\?sys_temp_dir =.*$|sys_temp_dir = ${DATADIR}/tmp|" /etc/php/"${PHPVER}"/fpm/php.ini
141141

‎bin/ncp/CONFIG/nc-limits.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@ configure()
8282
[[ "$CONF_VALUE" == "$(cat "$CONF")" ]] || service mariadb restart
8383

8484
# RESTART PHP
85-
[[ "$require_fpm_restart" == "true" ]] && {
85+
[[ "$require_fpm_restart" != "true" ]] || {
8686
bash -c "sleep 3; source /usr/local/etc/library.sh; clear_opcache; service php${PHPVER}-fpm restart" &>/dev/null &
8787
}
8888

8989
# redis max memory
9090
local CONF=/etc/redis/redis.conf
9191
local CURRENT_REDIS_MEM="$( grep "^maxmemory" "$CONF" | awk '{ print $2 }' )"
92-
[[ "$REDISMEM" != "$CURRENT_REDIS_MEM" ]] && {
92+
[[ "$REDISMEM" == "$CURRENT_REDIS_MEM" ]] || {
9393
sed -i "s|^maxmemory .*|maxmemory $REDISMEM|" "$CONF"
9494
chown redis:redis "$CONF"
9595
service redis-server restart

‎changelog.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# NextcloudPi Changelog
22

3+
## [v1.55.4](https://github.com/nextcloud/nextcloudpi/tree/v1.55.3) (2025-03-24) Nextcloud 31 and fixes
4+
5+
### Changes
6+
7+
- Support for Nextcloud 31
8+
9+
### Fixes
10+
11+
- Fix wrongly configured temporary directory for uploads (fixes [#1750](https://github.com/nextcloud/nextcloudpi/issues/1750), [#1857](https://github.com/nextcloud/nextcloudpi/issues/1857)), thanks [@joshtrichards](https://github.com/joshtrichards)
12+
- Fix regression breaking php upgrades (see [#2026](https://github.com/nextcloud/nextcloudpi/pull/2026)), thanks [@twojstaryzdomu](https://github.com/twojstaryzdomu)
13+
314
## [v1.55.3](https://github.com/nextcloud/nextcloudpi/tree/v1.55.3) (2024-11-08) Nextcloud 30 and fixes
415

516
### Changes

‎etc/library.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export DB_PREFIX="$(php -r 'include("/var/www/nextcloud/config/config.php"); ech
2222
export SYSTEMD_PAGER=
2323

2424
[[ -f "$NCPCFG" ]] || export NCPCFG=/usr/local/etc/ncp.cfg
25-
[[ -f "$NCPCFG" ]] || { echo "$NCPCFG not found" >2; exit 1; }
25+
[[ -f "$NCPCFG" ]] || { echo "$NCPCFG not found" >&2; exit 1; }
2626

2727
if [[ "$(ps -p 1 --no-headers -o "%c")" == "systemd" ]] && ! [[ -d "/run/systemd/system" ]]
2828
then

‎etc/ncp-config.d/nc-nextcloud.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{
1010
"id": "VER",
1111
"name": "Version",
12-
"value": "30.0.1"
12+
"value": "31.0.2"
1313
},
1414
{
1515
"id": "MAXFILESIZE",

0 commit comments

Comments
 (0)