diff options
author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2022-09-27 08:23:24 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-27 08:23:24 +0300 |
commit | 92705c560edd4d4229f7f333df3effbfe42a7fe9 (patch) | |
tree | 91e5e4cff97d3d1d11508dab6e9c8857e8b256f8 | |
parent | 6bf064a292da9f7cfa92519e7142003a219157f8 (diff) | |
parent | c4bf4ae2c58f07f119662448417e61dca9b0ba8a (diff) |
Merge pull request #1293 from nextcloud/migrate-stable25-christophwurst-packagev25.0.0rc2
Migrate to nextcloud/OCP package in stable25
-rw-r--r-- | .github/workflows/psalm.yml (renamed from .github/workflows/static-analysis.yml) | 11 | ||||
-rw-r--r-- | .github/workflows/update-nextcloud-ocp.yml | 65 | ||||
-rw-r--r-- | composer.json | 6 | ||||
-rw-r--r-- | composer.lock | 90 |
4 files changed, 116 insertions, 56 deletions
diff --git a/.github/workflows/static-analysis.yml b/.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-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml new file mode 100644 index 0000000..a396b6f --- /dev/null +++ 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 index f5a15ef..85065ef 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\\Notifications\\": "lib/" } }, @@ -11,8 +11,8 @@ "require-dev": { "phpunit/phpunit": "^9.5", "nextcloud/coding-standard": "^1.0.0", - "christophwurst/nextcloud": "dev-stable25", - "vimeo/psalm": "^4.3.2" + "vimeo/psalm": "^4.3.2", + "nextcloud/ocp": "dev-stable25" }, "config": { "optimize-autoloader": true, diff --git a/composer.lock b/composer.lock index c39d935..334cc63 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": "994180a4abf935d31645940c43655f51", + "content-hash": "54ed6c881a8ecac7676607dc202a3b7c", "packages": [], "packages-dev": [ { @@ -174,50 +174,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", "source": { @@ -1103,6 +1059,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.13.2", "source": { @@ -4842,7 +4840,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "christophwurst/nextcloud": 20 + "nextcloud/ocp": 20 }, "prefer-stable": false, "prefer-lowest": false, |