Skip to content

Commit 70f440d

Browse files
Merge pull request #777 from nextcloud/release/0.9.2
Create Release 0.9.2
2 parents 7c0b3ac + f7a84e4 commit 70f440d

36 files changed

+1020
-132
lines changed

.github/actions/run-tests/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ runs:
4545
--start-helpers
4646
--setup-environment ${{ inputs.coreVersion }}
4747
--create-env-dump
48+
--create-plain-dump plain
4849
--install-composer-deps
4950
--run-tests
5051
--extract-code-coverage

.github/actions/run-tests/docker-compose.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ services:
4545
#GITHUB_SERVER_URL
4646
#GITHUB_API_URL
4747
#GITHUB_GRAPHQL_URL
48+
DEBUG_MODE:
49+
DEBUG_PORT:
50+
DEBUG_HOST:
51+
DEBUG_UPON_ERROR:
52+
DEBUG_START_MODE:
53+
DEBUG_TRACE_FORMAT:
54+
QUICK_MODE:
4855
env_file:
4956
- mysql.env
5057
- postgres.env
@@ -56,6 +63,7 @@ services:
5663
- ./volumes/dumps:/dumps
5764
- ./volumes/coverage:/coverage
5865
- ./volumes/www/:/www
66+
- ./volumes/output:/output
5967

6068
occ:
6169
<<: *dut

.github/actions/run-tests/reset-from-container.sh

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#! /bin/sh -e
1+
#! /bin/bash -e
22

33
BACKUP="$1"
44

@@ -13,8 +13,30 @@ case "$INPUT_DB" in
1313
mysql -u root -p"$MYSQL_ROOT_PASSWORD" -h mysql < "/dumps/$BACKUP/sql/dump.sql"
1414
;;
1515
pgsql)
16+
echo 'Dropping old data'
1617
PGPASSWORD="$POSTGRES_PASSWORD" \
17-
psql -d "$POSTGRES_DB" -h postgres -U "$POSTGRES_USER" < "/dumps/$BACKUP/sql/dump.sql"
18+
psql -d "$POSTGRES_DB" -h postgres -U "$POSTGRES_USER" -v 'ON_ERROR_STOP=1' <<- EOF || exit 1
19+
DROP SCHEMA public CASCADE;
20+
CREATE SCHEMA public;
21+
GRANT ALL ON SCHEMA public TO $POSTGRES_USER;
22+
GRANT ALL ON SCHEMA public TO public;
23+
EOF
24+
25+
# PGPASSWORD="$POSTGRES_PASSWORD" \
26+
# psql -d "$POSTGRES_DB" -h postgres -U "$POSTGRES_USER" <<- EOF
27+
# \l
28+
# \d
29+
# SELECT * FROM oc_preferences WHERE appid='cookbook';
30+
# EOF
31+
32+
echo 'Inserting dump data'
33+
PGPASSWORD="$POSTGRES_PASSWORD" \
34+
psql -d "$POSTGRES_DB" -h postgres -U "$POSTGRES_USER" -f "/dumps/$BACKUP/sql/dump.sql" -v 'ON_ERROR_STOP=1' || exit 1
35+
36+
# PGPASSWORD="$POSTGRES_PASSWORD" \
37+
# psql -d "$POSTGRES_DB" -h postgres -U "$POSTGRES_USER" <<- EOF
38+
# SELECT * FROM oc_preferences WHERE appid='cookbook';
39+
# EOF
1840
;;
1941
sqlite)
2042
echo "Doing nothing as it was already restored during data restoration."

0 commit comments

Comments
 (0)