Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .changelog/current/3324-nc35.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Maintenance

- Mark app as compatible with NC35

2 changes: 1 addition & 1 deletion .github/actions/deploy/appinfo/info.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR AGPL-3.0-or-later
<screenshot>https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot2.png</screenshot>
<dependencies>
<php min-version="8.0"/>
<nextcloud min-version="31" max-version="34"/>
<nextcloud min-version="31" max-version="35"/>
</dependencies>
<navigations>
<navigation>
Expand Down
12 changes: 5 additions & 7 deletions .github/actions/run-tests/reset-from-container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@ is_file_dump () {

restore_mysql_dump () {
echo "Dropping old data from the database"
echo "Getting tables"
mariadb -u root -p"$MYSQL_ROOT_PASSWORD" -h mysql --skip-ssl "$MYSQL_DATABASE" <<- EOF | tail -n +2 > /tmp/mysql_tables
SHOW TABLES;
EOF
echo "Got:"
cat /tmp/mysql_tables
cat /tmp/mysql_tables | sed 's@.*@DROP TABLE \0;@' | mysql -u root -p"$MYSQL_ROOT_PASSWORD" -h mysql --skip-ssl "$MYSQL_DATABASE"
mysql -u root -p"$MYSQL_ROOT_PASSWORD" -h mysql --skip-ssl <<- EOF
DROP DATABASE ${MYSQL_DATABASE};
CREATE DATABASE ${MYSQL_DATABASE};
GRANT ALL ON ${MYSQL_DATABASE}.* TO '${MYSQL_USER}'@'%';
EOF

echo "Restoring MySQL from single file dump"
local dump_file="$SF_DIR/sql/dump.sql"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,18 +132,18 @@ jobs:
database:
- mysql
coreVersion:
- 34
- 35
phpVersion:
- "8.5"
httpServer:
- "apache"
include:
- database: sqlite
coreVersion: 32
coreVersion: 33
phpVersion: "8.3"
httpServer: "apache"
- database: pgsql
coreVersion: 33
coreVersion: 34
phpVersion: "8.4"
httpServer: "nginx"

Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR AGPL-3.0-or-later
<screenshot>https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot2.png</screenshot>
<dependencies>
<php min-version="8.0"/>
<nextcloud min-version="31" max-version="34"/>
<nextcloud min-version="31" max-version="35"/>
</dependencies>
<navigations>
<navigation>
Expand Down
Loading