From c6e96a8c03170eae65805ffd84a9687e26047520 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 26 Sep 2022 20:23:29 +0200 Subject: [PATCH 1/2] Migrate to nextcloud/OCP package in stable23 Signed-off-by: Joas Schilling --- .github/workflows/psalm.yml | 30 ++++++++ .github/workflows/static-analysis.yml | 26 ------- .github/workflows/update-nextcloud-ocp.yml | 65 ++++++++++++++++ composer.json | 51 +++++++------ composer.lock | 87 +++++++++++----------- 5 files changed, 168 insertions(+), 91 deletions(-) create mode 100644 .github/workflows/psalm.yml delete mode 100644 .github/workflows/static-analysis.yml create mode 100644 .github/workflows/update-nextcloud-ocp.yml diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml new file mode 100644 index 00000000000..ff271c1e716 --- /dev/null +++ b/.github/workflows/psalm.yml @@ -0,0 +1,30 @@ +name: Static analysis + +on: + pull_request: + push: + branches: + - master + - main + - stable* + +jobs: + static-analysis: + runs-on: ubuntu-latest + + name: Nextcloud ${{ matrix.ocp-version }} + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Set up php + uses: shivammathur/setup-php@v2 + with: + php-version: 7.4 + coverage: none + + - name: Install dependencies + run: composer i + + - name: Run coding standards check + run: composer run psalm diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml deleted file mode 100644 index 88cd669af49..00000000000 --- a/.github/workflows/static-analysis.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Static analysis - -on: [pull_request] - -jobs: - static-psalm-analysis: - runs-on: ubuntu-latest - strategy: - matrix: - ocp-version: [ 'dev-stable23' ] - name: Nextcloud ${{ matrix.ocp-version }} - steps: - - name: Checkout - uses: actions/checkout@master - - name: Set up php - uses: shivammathur/setup-php@master - with: - php-version: 7.4 - tools: composer:v1 - coverage: none - - 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 new file mode 100644 index 00000000000..a396b6f875b --- /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 + author: nextcloud-command + 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 b35c7fc1f89..ce449bbc9a8 100644 --- a/composer.json +++ b/composer.json @@ -1,25 +1,30 @@ { - "name": "nextcloud/text", - "type": "project", - "require-dev": { - "roave/security-advisories": "dev-master", - "christophwurst/nextcloud": "dev-stable23", - "jakub-onderka/php-parallel-lint": "^1.0.0", - "nextcloud/coding-standard": "^0.5.0", - "psalm/phar": "^4.3", - "ext-mbstring": "*" - }, - "license": "AGPLv3", - "authors": [ - { - "name": "Julius Härtl", - "email": "jus@bitgrid.net" - } - ], - "scripts": { - "lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l", - "cs:check": "php-cs-fixer fix --dry-run --diff", - "cs:fix": "php-cs-fixer fix", - "psalm": "psalm.phar" - } + "name": "nextcloud/text", + "type": "project", + "require-dev": { + "roave/security-advisories": "dev-master", + "jakub-onderka/php-parallel-lint": "^1.0.0", + "nextcloud/coding-standard": "^0.5.0", + "psalm/phar": "^4.3", + "ext-mbstring": "*", + "nextcloud/ocp": "dev-stable23" + }, + "license": "AGPLv3", + "authors": [ + { + "name": "Julius Härtl", + "email": "jus@bitgrid.net" + } + ], + "scripts": { + "lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l", + "cs:check": "php-cs-fixer fix --dry-run --diff", + "cs:fix": "php-cs-fixer fix", + "psalm": "psalm.phar" + }, + "autoload-dev": { + "psr-4": { + "OCP\\": "vendor/nextcloud/ocp/OCP" + } + } } diff --git a/composer.lock b/composer.lock index 400832d9b95..70ebffdb770 100644 --- a/composer.lock +++ b/composer.lock @@ -4,48 +4,9 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "08c970b3d11a483fa6df1e4f3271708b", + "content-hash": "1c6d7fc475152e7d7367aff723453b0d", "packages": [], "packages-dev": [ - { - "name": "christophwurst/nextcloud", - "version": "dev-stable23", - "source": { - "type": "git", - "url": "https://github.com/ChristophWurst/nextcloud_composer.git", - "reference": "3725f37085a0de42135df9aad3939f7a137205c2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/3725f37085a0de42135df9aad3939f7a137205c2", - "reference": "3725f37085a0de42135df9aad3939f7a137205c2", - "shasum": "" - }, - "require": { - "php": "^7.3 || ~8.0.0", - "psr/container": "^1.1.1", - "psr/event-dispatcher": "^1.0", - "psr/log": "^1.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "23.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)", - "time": "2022-06-02T14:13:38+00:00" - }, { "name": "composer/pcre", "version": "1.0.1", @@ -581,6 +542,48 @@ "description": "Nextcloud coding standards for the php cs fixer", "time": "2021-01-11T14:15:58+00:00" }, + { + "name": "nextcloud/ocp", + "version": "dev-stable23", + "source": { + "type": "git", + "url": "https://github.com/nextcloud-deps/ocp.git", + "reference": "74fa82bb013bb329eb59b18d6eb94a660d724fea" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/74fa82bb013bb329eb59b18d6eb94a660d724fea", + "reference": "74fa82bb013bb329eb59b18d6eb94a660d724fea", + "shasum": "" + }, + "require": { + "php": "^7.3 || ~8.0.0", + "psr/container": "^1.1.1", + "psr/event-dispatcher": "^1.0", + "psr/log": "^1.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "23.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/stable23" + }, + "time": "2022-08-23T02:31:53+00:00" + }, { "name": "php-cs-fixer/diff", "version": "v1.3.1", @@ -2743,7 +2746,7 @@ "minimum-stability": "stable", "stability-flags": { "roave/security-advisories": 20, - "christophwurst/nextcloud": 20 + "nextcloud/ocp": 20 }, "prefer-stable": false, "prefer-lowest": false, @@ -2751,5 +2754,5 @@ "platform-dev": { "ext-mbstring": "*" }, - "plugin-api-version": "1.1.0" + "plugin-api-version": "2.3.0" } From 6bfedf5f26f51f3dcd2b937c777cfac30c852d3f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 27 Sep 2022 07:55:09 +0200 Subject: [PATCH 2/2] More package rename Signed-off-by: Joas Schilling --- psalm.xml | 2 +- tests/psalm-baseline.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/psalm.xml b/psalm.xml index dbfd50a208c..b93ed82c3b2 100644 --- a/psalm.xml +++ b/psalm.xml @@ -10,7 +10,7 @@ - + diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml index 0c62e2e60ed..a56ad86bd0f 100644 --- a/tests/psalm-baseline.xml +++ b/tests/psalm-baseline.xml @@ -149,7 +149,7 @@ null - + $jobList