Skip to content

Commit e32ce00

Browse files
committed
1.57.0.sh, lamp.sh: Install php-apcu
1 parent b1e111e commit e32ce00

4 files changed

Lines changed: 11 additions & 5 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ jobs:
162162
run: |
163163
set -x
164164
mv "output/${ARTIFACT_FILE?}" ncp.img
165+
sudo apt-get update
165166
sudo apt-get install -y systemd-container
166167
python3 -m venv ./.venv
167168
. ./.venv/bin/activate

.github/workflows/vm-tests.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,10 @@ jobs:
215215
}
216216
- name: perform update
217217
working-directory: /ncp-test-automation/bin
218+
shell: bash
218219
run: |
219-
set -e
220+
set -ex
221+
apk add jq
220222
221223
echo "Setup ssh"
222224
chmod 0600 /__w/nextcloudpi/nextcloudpi/.ssh/automation_ssh_key
@@ -230,12 +232,12 @@ jobs:
230232
ssh "${SSH_OPTIONS[@]}" "root@${SERVER_ADDRESS}" "DBG=x ncp-update '$VERSION'"
231233
echo "Updating Nextcloud"
232234
233-
ssh "${SSH_OPTIONS[@]}" "root@${SERVER_ADDRESS}" "ncc status" | grep "version:" | awk '{ print $3 }')"
235+
ssh "${SSH_OPTIONS[@]}" "root@${SERVER_ADDRESS}" "ncc status" | grep "version:" | awk '{ print $3 }'
234236
latest_nc_version="$(cat /__w/nextcloudpi/nextcloudpi/etc/ncp.cfg | jq -r '.nextcloud_version')"
235237
236238
for i in {1..10};
237239
do
238-
echo "running nc update ($i/10)..."
240+
echo "running nc update $i/10..."
239241
ssh "${SSH_OPTIONS[@]}" "root@${SERVER_ADDRESS}" "DBG=x ncp-update-nc ${latest_nc_version?}"
240242
241243
ssh "${SSH_OPTIONS[@]}" "root@${SERVER_ADDRESS}" /usr/local/bin/ncc status

lamp.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ install()
4040
install_with_shadow_workaround --no-install-recommends systemd
4141
$APTINSTALL -t $RELEASE php${PHPVER} php${PHPVER}-curl php${PHPVER}-gd php${PHPVER}-fpm php${PHPVER}-cli php${PHPVER}-opcache \
4242
php${PHPVER}-mbstring php${PHPVER}-xml php${PHPVER}-zip php${PHPVER}-fileinfo php${PHPVER}-ldap \
43-
php${PHPVER}-intl php${PHPVER}-bz2
43+
php${PHPVER}-intl php${PHPVER}-bz2 php${PHPVER}-apcu
4444

4545
mkdir -p /run/php
4646

updates/1.57.0.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22

33
set -eu
44

5-
ncc config:system:set serverid --value="$((RANDOM % 1024))" --type=integer
5+
source /usr/local/etc/library.sh
6+
7+
ncc config:system:set serverid --value=
8+
sudo apt-get install php${PHPVER}-apcu

0 commit comments

Comments
 (0)