Merge pull request #61 from nextcloud/migrate-stable25-christophwurst…

…-package Migrate to nextcloud/OCP package in stable25
nextcloud · Oct 8, 2022 · ff94719 · ff94719
2 parents de87ad1 + 82e434e
commit ff94719
Show file tree

Hide file tree

Showing 5 changed files with 224 additions and 156 deletions.
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -5,20 +5,17 @@ on:
   push:
     branches:
       - master
+      - main
       - stable*
 
 jobs:
-  static-psalm-analysis:
+  static-analysis:
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        ocp-version: [ 'dev-stable25' ]
-
     name: Nextcloud ${{ matrix.ocp-version }}
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@v3
 
       - name: Set up php
         uses: shivammathur/setup-php@v2
@@ -29,8 +26,5 @@ jobs:
       - name: Install dependencies
         run: composer i
 
-      - name: Install dependencies
-        run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }}
-
       - name: Run coding standards check
         run: composer run psalm
diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml
@@ -0,0 +1,65 @@
+# This workflow is provided via the organization template repository
+#
+# https://github.com/nextcloud/.github
+# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+
+name: Update nextcloud/ocp
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "5 4 * * 0"
+
+jobs:
+  update-nextcloud-ocp:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        branches: ["master", "stable25", "stable24", "stable23"]
+
+    name: update-nextcloud-ocp-${{ matrix.branches }}
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ matrix.branches }}
+          submodules: true
+
+      - name: Set up php7.4
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
+          coverage: none
+
+      - name: Composer install
+        run: composer install
+
+      - name: Composer update nextcloud/ocp
+        run: composer require --dev nextcloud/ocp:dev-${{ matrix.branches }}
+        continue-on-error: true
+
+      - name: Reset checkout dirs
+        run: |
+          git clean -f 3rdparty
+          git clean -f vendor
+          git checkout 3rdparty vendor
+        continue-on-error: true
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        with:
+          token: ${{ secrets.COMMAND_BOT_PAT }}
+          commit-message: Update psalm baseline
+          committer: GitHub <noreply@github.com>
+          author: nextcloud-command <nextcloud-command@users.noreply.github.com>
+          signoff: true
+          branch: automated/noid/${{ matrix.branches }}-update-nextcloud-ocp
+          title: "[${{ matrix.branches }}] Update nextcloud/ocp dependency"
+          body: |
+            Auto-generated update of [nextcloud/ocp](https://github.com/nextcloud-deps/ocp/) dependency
+          labels: |
+            dependencies
+            3. to review
diff --git a/composer.json b/composer.json
@@ -1,41 +1,46 @@
 {
-  "name": "nextcloud/related_resources",
-  "description": "RelatedResources App",
-  "minimum-stability": "stable",
-  "license": "agpl",
-  "config": {
-    "optimize-autoloader": true,
-    "classmap-authoritative": true,
-    "autoloader-suffix": "RelatedResources",
-    "platform": {
-      "php": "7.4"
-    }
-  },  "authors": [
-    {
-      "name": "Maxence Lange",
-      "email": "maxence@artificial-owl.com"
-    }
-  ],
-  "autoload": {
-    "psr-4": {
-      "OCA\\RelatedResources\\": "lib/"
-    }
-  },
-  "scripts": {
-    "cs:check": "php-cs-fixer fix --dry-run --diff",
-    "cs:fix": "php-cs-fixer fix",
-    "psalm": "psalm --threads=1 --update-baseline",
-    "psalm:init": "psalm --init",
-    "psalm:update-baseline": "psalm --threads=1 --update-baseline",
-    "psalm:clear": "psalm --clear-cache && psalm --clear-global-cache",
-    "psalm:fix": "psalm --alter --issues=InvalidReturnType,MissingReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
-    "lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l"
-  },
-  "require-dev": {
-    "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^4.22",
-    "christophwurst/nextcloud": "dev-stable25",
-    "nextcloud/coding-standard": "^1.0"
-  }
-
+	"name": "nextcloud/related_resources",
+	"description": "RelatedResources App",
+	"minimum-stability": "stable",
+	"license": "agpl",
+	"config": {
+		"optimize-autoloader": true,
+		"classmap-authoritative": true,
+		"autoloader-suffix": "RelatedResources",
+		"platform": {
+			"php": "7.4"
+		}
+	},
+	"authors": [
+		{
+			"name": "Maxence Lange",
+			"email": "maxence@artificial-owl.com"
+		}
+	],
+	"autoload": {
+		"psr-4": {
+			"OCA\\RelatedResources\\": "lib/"
+		}
+	},
+	"scripts": {
+		"cs:check": "php-cs-fixer fix --dry-run --diff",
+		"cs:fix": "php-cs-fixer fix",
+		"psalm": "psalm --threads=1 --update-baseline",
+		"psalm:init": "psalm --init",
+		"psalm:update-baseline": "psalm --threads=1 --update-baseline",
+		"psalm:clear": "psalm --clear-cache && psalm --clear-global-cache",
+		"psalm:fix": "psalm --alter --issues=InvalidReturnType,MissingReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
+		"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l"
+	},
+	"require-dev": {
+		"phpunit/phpunit": "^9.5",
+		"vimeo/psalm": "^4.22",
+		"nextcloud/coding-standard": "^1.0",
+		"nextcloud/ocp": "dev-stable25"
+	},
+	"autoload-dev": {
+		"psr-4": {
+			"OCP\\": "vendor/nextcloud/ocp/OCP"
+		}
+	}
 }