From b188a04d08e94f22b9687bbb54420a6b0970c5a1 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 26 Sep 2022 20:04:06 +0200 Subject: [PATCH] Migrate to nextcloud/OCP package in stable25 Signed-off-by: Joas Schilling --- .../{static-analysis.yml => psalm.yml} | 11 +-- ...nextcloud.yml => update-nextcloud-ocp.yml} | 16 ++-- composer.json | 4 +- composer.lock | 90 +++++++++---------- 4 files changed, 58 insertions(+), 63 deletions(-) rename .github/workflows/{static-analysis.yml => psalm.yml} (72%) rename .github/workflows/{update-christophwurst-nextcloud.yml => update-nextcloud-ocp.yml} (71%) diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/psalm.yml similarity index 72% rename from .github/workflows/static-analysis.yml rename to .github/workflows/psalm.yml index 7dc1b16..ff271c1 100644 --- a/.github/workflows/static-analysis.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 @@ -27,7 +24,7 @@ jobs: coverage: none - name: Install dependencies - run: composer install --dev + run: composer i - name: Run coding standards check run: composer run psalm diff --git a/.github/workflows/update-christophwurst-nextcloud.yml b/.github/workflows/update-nextcloud-ocp.yml similarity index 71% rename from .github/workflows/update-christophwurst-nextcloud.yml rename to .github/workflows/update-nextcloud-ocp.yml index 50c81c6..a396b6f 100644 --- a/.github/workflows/update-christophwurst-nextcloud.yml +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -3,7 +3,7 @@ # https://github.com/nextcloud/.github # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization -name: Update christophwurst/nextcloud +name: Update nextcloud/ocp on: workflow_dispatch: @@ -11,7 +11,7 @@ on: - cron: "5 4 * * 0" jobs: - update-christophwurst-nextcloud: + update-nextcloud-ocp: runs-on: ubuntu-latest strategy: @@ -19,7 +19,7 @@ jobs: matrix: branches: ["master", "stable25", "stable24", "stable23"] - name: update-christophwurst-nextcloud-${{ matrix.branches }} + name: update-nextcloud-ocp-${{ matrix.branches }} steps: - uses: actions/checkout@v3 @@ -37,8 +37,8 @@ jobs: - name: Composer install run: composer install - - name: Composer update christophwurst/nextcloud - run: composer require --dev christophwurst/nextcloud:dev-${{ matrix.branches }} + - name: Composer update nextcloud/ocp + run: composer require --dev nextcloud/ocp:dev-${{ matrix.branches }} continue-on-error: true - name: Reset checkout dirs @@ -56,10 +56,10 @@ jobs: committer: GitHub author: nextcloud-command signoff: true - branch: automated/noid/${{ matrix.branches }}-update-christophwurst-nextcloud - title: "[${{ matrix.branches }}] Update christophwurst/nextcloud dependency" + branch: automated/noid/${{ matrix.branches }}-update-nextcloud-ocp + title: "[${{ matrix.branches }}] Update nextcloud/ocp dependency" body: | - Auto-generated update of [christophwurst/nextcloud](https://github.com/ChristophWurst/nextcloud_composer/) dependency + 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 index 2d428b9..ca428c5 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "autoload-dev": { "psr-4": { - "OCP\\": "vendor/christophwurst/nextcloud/OCP", + "OCP\\": "vendor/nextcloud/ocp/OCP", "OCA\\NextcloudAnnouncements\\": "lib/" } }, @@ -26,8 +26,8 @@ "psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType" }, "require-dev": { - "christophwurst/nextcloud": "dev-stable25", "nextcloud/coding-standard": "^1.0.0", + "nextcloud/ocp": "dev-stable25", "phpunit/phpunit": "^9.5", "vimeo/psalm": "^4.27.0" } diff --git a/composer.lock b/composer.lock index 626513c..8077e5c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "78aba6b77017cf8b7b6d07d069986504", + "content-hash": "9c62668632b733ca3b624253d8bbee58", "packages": [], "packages-dev": [ { @@ -173,50 +173,6 @@ ], "time": "2021-03-30T17:13:30+00:00" }, - { - "name": "christophwurst/nextcloud", - "version": "dev-stable25", - "source": { - "type": "git", - "url": "https://github.com/ChristophWurst/nextcloud_composer.git", - "reference": "f79ac43d0422211b35542856338d808bc94a116b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/f79ac43d0422211b35542856338d808bc94a116b", - "reference": "f79ac43d0422211b35542856338d808bc94a116b", - "shasum": "" - }, - "require": { - "php": "^7.4 || ~8.0 || ~8.1", - "psr/container": "^1.1.1", - "psr/event-dispatcher": "^1.0", - "psr/log": "^1.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "26.0.0-dev" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "AGPL-3.0-or-later" - ], - "authors": [ - { - "name": "Christoph Wurst", - "email": "christoph@winzerhof-wurst.at" - } - ], - "description": "Composer package containing Nextcloud's public API (classes, interfaces)", - "support": { - "issues": "https://github.com/ChristophWurst/nextcloud_composer/issues", - "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/stable25" - }, - "abandoned": "nextcloud/ocp", - "time": "2022-09-22T12:39:39+00:00" - }, { "name": "composer/package-versions-deprecated", "version": "1.11.99.5", @@ -1105,6 +1061,48 @@ }, "time": "2021-11-10T08:44:10+00:00" }, + { + "name": "nextcloud/ocp", + "version": "dev-stable25", + "source": { + "type": "git", + "url": "https://github.com/nextcloud-deps/ocp.git", + "reference": "f79ac43d0422211b35542856338d808bc94a116b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/f79ac43d0422211b35542856338d808bc94a116b", + "reference": "f79ac43d0422211b35542856338d808bc94a116b", + "shasum": "" + }, + "require": { + "php": "^7.4 || ~8.0 || ~8.1", + "psr/container": "^1.1.1", + "psr/event-dispatcher": "^1.0", + "psr/log": "^1.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "26.0.0-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "AGPL-3.0-or-later" + ], + "authors": [ + { + "name": "Christoph Wurst", + "email": "christoph@winzerhof-wurst.at" + } + ], + "description": "Composer package containing Nextcloud's public API (classes, interfaces)", + "support": { + "source": "https://github.com/nextcloud-deps/ocp/tree/stable25" + }, + "time": "2022-09-22T12:39:39+00:00" + }, { "name": "nikic/php-parser", "version": "v4.15.1", @@ -4722,7 +4720,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "christophwurst/nextcloud": 20 + "nextcloud/ocp": 20 }, "prefer-stable": false, "prefer-lowest": false,