From e717b741732dfc309931995bf5dc5876600d2b55 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Mon, 9 Aug 2021 17:55:55 +0200 Subject: [PATCH 1/7] Formally make app compatible with NC 22 Signed-off-by: Christian Wolf --- .github/actions/deploy/appinfo/info.xml.dist | 2 +- .github/workflows/tests.yml | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/actions/deploy/appinfo/info.xml.dist b/.github/actions/deploy/appinfo/info.xml.dist index ac0baa02e..57f16d2b1 100755 --- a/.github/actions/deploy/appinfo/info.xml.dist +++ b/.github/actions/deploy/appinfo/info.xml.dist @@ -17,7 +17,7 @@ https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot2.png - + diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 081d20725..aa23e938c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -81,7 +81,7 @@ jobs: - pgsql - sqlite coreVersion: - - stable21 + - stable22 phpVersion: - "7" httpServer: @@ -100,17 +100,27 @@ jobs: phpVersion: "7" httpServer: "apache" mayFail: false + - database: mysql + coreVersion: stable21 + phpVersion: "7" + httpServer: "apache" + mayFail: false # Test different PHP versions additionally - database: mysql - coreVersion: stable21 + coreVersion: stable22 phpVersion: "7.3" httpServer: "apache" mayFail: false + - database: mysql + coreVersion: stable22 + phpVersion: "8" + httpServer: "apache" + mayFail: false # Test different HTTP server - database: mysql - coreVersion: stable21 + coreVersion: stable22 phpVersion: "7" httpServer: "nginx" mayFail: false From ef2537ca41a36345fc92447ca22edcc91f25ab4c Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Mon, 9 Aug 2021 17:57:29 +0200 Subject: [PATCH 2/7] Removed appinfo from repository Signed-off-by: Christian Wolf --- .gitignore | 2 ++ appinfo/info.xml | 29 ----------------------------- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100755 appinfo/info.xml diff --git a/.gitignore b/.gitignore index c9a1cf43c..0ed3ceaf3 100755 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ *.swp *.swo +/appinfo/info.xml + cookbook.tar.gz .idea/ diff --git a/appinfo/info.xml b/appinfo/info.xml deleted file mode 100755 index b719f4c33..000000000 --- a/appinfo/info.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - cookbook - Cookbook - An integrated cookbook using schema.org JSON files as recipes - - 0.9.2 - agpl - Jeppe Zapp - Cookbook - organization - https://github.com/nextcloud/cookbook/ - https://github.com/nextcloud/cookbook/issues - https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot1_small.png - https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot2.png - - - - - - - Cookbook - cookbook.main.index - app.svg - - - From b73378fe603987985a26cd0742f0e487398836bf Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Mon, 9 Aug 2021 18:16:00 +0200 Subject: [PATCH 3/7] Create appinfo using Makefile Signed-off-by: Christian Wolf --- .github/actions/deploy/update-data.sh | 13 +++++++++++++ Makefile | 3 +++ 2 files changed, 16 insertions(+) create mode 100755 .github/actions/deploy/update-data.sh diff --git a/.github/actions/deploy/update-data.sh b/.github/actions/deploy/update-data.sh new file mode 100755 index 000000000..8f5817863 --- /dev/null +++ b/.github/actions/deploy/update-data.sh @@ -0,0 +1,13 @@ +#! /bin/sh + +# set -x + +deploy_path='.github/actions/deploy' + +major=$(cat "$deploy_path/major") +minor=$(cat "$deploy_path/minor") +patch=$(cat "$deploy_path/patch") + +version="$major.$minor.$patch" + +"$deploy_path/fill-in-data.sh" "$version" "$major" "$minor" "$patch" diff --git a/Makefile b/Makefile index d0d9e6297..1a4143c45 100755 --- a/Makefile +++ b/Makefile @@ -177,3 +177,6 @@ appstore: .PHONY: test test: composer @echo "This functionality has been move to the file .github/acrions/run-tests/run-locally.sh. See its output with parameter --help." + +appinfo/info.xml: .github/actions/deploy/patch .github/actions/deploy/minor .github/actions/deploy/major + .github/actions/deploy/update-data.sh From beca2659e95851fda1793f1ce88acf214e9b25a6 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Mon, 9 Aug 2021 18:20:06 +0200 Subject: [PATCH 4/7] Correctly outsourced update of data and removed adding of appinfo XML file Signed-off-by: Christian Wolf --- .github/actions/deploy/create-version.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/deploy/create-version.sh b/.github/actions/deploy/create-version.sh index 3b49c170f..305e50609 100755 --- a/.github/actions/deploy/create-version.sh +++ b/.github/actions/deploy/create-version.sh @@ -47,9 +47,9 @@ echo "New version is $version." git config user.name 'Github actions bot' git config user.email 'bot@noreply.github.com' -"$deploy_path/fill-in-data.sh" "$version" "$major" "$minor" "$patch" +"$deploy_path/update-data.sh" -git add appinfo/info.xml package.json lib/Controller/MainController.php +git add package.json lib/Controller/MainController.php git commit -s -m "Bump to version $version" git tag "v$version" From e27a6546441c4a834c98dc70903fa0251014be64 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Mon, 9 Aug 2021 18:20:38 +0200 Subject: [PATCH 5/7] Usage of MAKE variables for recursion counter and job management Signed-off-by: Christian Wolf --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 1a4143c45..0342ac094 100755 --- a/Makefile +++ b/Makefile @@ -56,13 +56,13 @@ all: build .PHONY: build build: ifneq (,$(wildcard $(CURDIR)/composer.json)) - make composer + $(MAKE) composer endif ifneq (,$(wildcard $(CURDIR)/package.json)) - make npm + $(MAKE) npm endif ifneq (,$(wildcard $(CURDIR)/js/package.json)) - make npm + $(MAKE) npm endif @@ -121,8 +121,8 @@ distclean: clean # Builds the source and appstore package .PHONY: dist dist: - make source - make appstore + $(MAKE) source + $(MAKE) appstore # Builds the source package .PHONY: source From a70c1031753ae5ade7dbd6e44e11c1e9e5fbef5e Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Mon, 9 Aug 2021 18:35:04 +0200 Subject: [PATCH 6/7] Build the appinfo XML during CI runs Signed-off-by: Christian Wolf --- .github/workflows/build-test-images.yml | 3 +++ .github/workflows/tests.yml | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/.github/workflows/build-test-images.yml b/.github/workflows/build-test-images.yml index 509aa7bf3..1f609c7dc 100644 --- a/.github/workflows/build-test-images.yml +++ b/.github/workflows/build-test-images.yml @@ -32,6 +32,9 @@ jobs: - name: Checkout the app uses: actions/checkout@v2 if: ${{ steps.check.outputs.skip == 'false' }} + - name: Make sure the appinfo is built + shell: bash + run: make appinfo/info.xml - name: Build and push the image shell: bash diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index aa23e938c..e31325dc7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,6 +13,9 @@ jobs: steps: - name: Checkout the project uses: actions/checkout@v2 + - name: Make sure the appinfo is built + shell: bash + run: make appinfo/info.xml - name: Get PHP version shell: bash run: php -v @@ -138,6 +141,10 @@ jobs: with: fetch-depth: 2 + - name: Ensure the appinfo is built + shell: bash + run: make appinfo/info.xml + #- name: Docker Layer Caching #uses: satackey/action-docker-layer-caching@v0.0.8 @@ -199,6 +206,10 @@ jobs: - name: Checkout the app uses: actions/checkout@v2 + - name: Ensure the appinfo is built + shell: bash + run: make appinfo/info.xml + - name: Install the NPM dependencies shell: bash run: >- From 533abe286584a224e63803e24648d58a3e32d70c Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Mon, 9 Aug 2021 18:37:52 +0200 Subject: [PATCH 7/7] Updated changelog Signed-off-by: Christian Wolf --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9829141d..a28145471 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ ## [Unreleased] +### Fixed +- Mark app as compatible with Nextcloud 22 + [#778](https://github.com/nextcloud/cookbook/pull/778) @christianlupus + +### Removed +- Removed app info XML file to avoid confusion + [#778](https://github.com/nextcloud/cookbook/pull/778) @christianlupus + ## 0.9.2 - 2021-08-09