From 8aafa869632954d03067e678585eddc379fc4b2f Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Wed, 12 Jul 2023 22:24:11 +0200 Subject: [PATCH] chore: Remove duplicated OCP dependency (nextcloud/ocp vs christophwurst/nextcloud) Signed-off-by: Ferdinand Thiessen --- .../update-christophwurst-nextcloud.yml | 65 --------------- .github/workflows/update-nextcloud-ocp.yml | 83 +++++++++++++++++++ composer.json | 3 +- composer.lock | 50 +---------- 4 files changed, 86 insertions(+), 115 deletions(-) delete mode 100644 .github/workflows/update-christophwurst-nextcloud.yml create mode 100644 .github/workflows/update-nextcloud-ocp.yml diff --git a/.github/workflows/update-christophwurst-nextcloud.yml b/.github/workflows/update-christophwurst-nextcloud.yml deleted file mode 100644 index aa6f0fcde..000000000 --- a/.github/workflows/update-christophwurst-nextcloud.yml +++ /dev/null @@ -1,65 +0,0 @@ -# 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 christophwurst/nextcloud - -on: - workflow_dispatch: - schedule: - - cron: "5 4 * * 0" - -jobs: - update-christophwurst-nextcloud: - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - branches: ["master", "stable25", "stable24", "stable23"] - - name: update-christophwurst-nextcloud-${{ matrix.branches }} - - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ matrix.branches }} - submodules: true - - - name: Set up php8.0 - uses: shivammathur/setup-php@v2 - with: - php-version: 8.0 - 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 christophwurst/nextcloud - run: composer require --dev christophwurst/nextcloud: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-christophwurst-nextcloud - title: "[${{ matrix.branches }}] Update christophwurst/nextcloud dependency" - body: | - Auto-generated update of [christophwurst/nextcloud](https://github.com/ChristophWurst/nextcloud_composer/) dependency - labels: | - dependencies - 3. to review diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml new file mode 100644 index 000000000..0cf31409c --- /dev/null +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -0,0 +1,83 @@ +# 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 2 * * 0" + +jobs: + update-nextcloud-ocp: + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + branches: ["main", "master", "stable27", "stable26", "stable25"] + + name: update-nextcloud-ocp-${{ matrix.branches }} + + steps: + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + with: + ref: ${{ matrix.branches }} + submodules: true + + - name: Set up php8.1 + uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2 + with: + php-version: 8.1 + # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation + extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite + coverage: none + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Composer install + run: composer install + + - name: Composer update nextcloud/ocp + if: matrix.branches != 'main' + run: composer require --dev nextcloud/ocp:dev-${{ matrix.branches }} + + - name: Composer update nextcloud/ocp + if: matrix.branches == 'main' + run: composer require --dev nextcloud/ocp:dev-master + + - name: Reset checkout 3rdparty + run: | + git clean -f 3rdparty + git checkout 3rdparty + continue-on-error: true + + - name: Reset checkout vendor + run: | + git clean -f vendor + git checkout vendor + continue-on-error: true + + - name: Reset checkout vendor-bin + run: | + git clean -f vendor-bin + git checkout vendor-bin + continue-on-error: true + + - name: Create Pull Request + uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v3 + with: + token: ${{ secrets.COMMAND_BOT_PAT }} + commit-message: "chore(dev-deps): Bump nextcloud/ocp package" + 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 3b280fb70..ab0b28eca 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,6 @@ "phpunit/phpunit": "^9.5", "vimeo/psalm": "^4.22", "nextcloud/coding-standard": "^1.0", - "nextcloud/ocp": "dev-master", - "christophwurst/nextcloud": "dev-master" + "nextcloud/ocp": "dev-master" } } diff --git a/composer.lock b/composer.lock index 1ca9a6b94..cf41e39ba 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": "518c38aba90a5bdf82963500c3a3ccbc", + "content-hash": "4202cbee01e48850ef10cf1e6de9f469", "packages": [], "packages-dev": [ { @@ -173,51 +173,6 @@ ], "time": "2021-03-30T17:13:30+00:00" }, - { - "name": "christophwurst/nextcloud", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/ChristophWurst/nextcloud_composer.git", - "reference": "ef467adce4c7680923d0145d69418d24d4ddec71" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/ef467adce4c7680923d0145d69418d24d4ddec71", - "reference": "ef467adce4c7680923d0145d69418d24d4ddec71", - "shasum": "" - }, - "require": { - "php": "^7.4 || ~8.0 || ~8.1", - "psr/container": "^1.1.1", - "psr/event-dispatcher": "^1.0", - "psr/log": "^1.1" - }, - "default-branch": true, - "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/master" - }, - "abandoned": "nextcloud/ocp", - "time": "2023-06-04T02:05:57+00:00" - }, { "name": "composer/package-versions-deprecated", "version": "1.11.99.5", @@ -4875,8 +4830,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "nextcloud/ocp": 20, - "christophwurst/nextcloud": 20 + "nextcloud/ocp": 20 }, "prefer-stable": false, "prefer-lowest": false,