Mark nextcloud veriosn 22 compatibility

.github/actions/deploy/appinfo/info.xml.dist

@@ -17,7 +17,7 @@
     <screenshot>https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot2.png</screenshot>
     <dependencies>
         <php min-version="7.3"/>
-        <nextcloud min-version="19" max-version="21"/>
+        <nextcloud min-version="19" max-version="22"/>
     </dependencies>
     <navigations>
         <navigation>

.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"

.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"

.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

.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
@@ -81,7 +84,7 @@ jobs:
                 - pgsql
                 - sqlite
             coreVersion:
-                - stable21
+                - stable22
             phpVersion:
                 - "7"
             httpServer:
@@ -100,17 +103,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
@@ -128,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
 
@@ -189,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: >-

.gitignore

@@ -1,6 +1,8 @@
 *.swp
 *.swo
 
+/appinfo/info.xml
+
 cookbook.tar.gz
 
 .idea/

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
 

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
@@ -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