Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to nextcloud/OCP package in stable23 #3062

Merged
merged 2 commits into from
Sep 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions .github/workflows/psalm.yml
Original file line number Diff line number Diff line change
@@ -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
26 changes: 0 additions & 26 deletions .github/workflows/static-analysis.yml

This file was deleted.

65 changes: 65 additions & 0 deletions .github/workflows/update-nextcloud-ocp.yml
Original file line number Diff line number Diff line change
@@ -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
51 changes: 28 additions & 23 deletions composer.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
87 changes: 45 additions & 42 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<directory name="lib" />
</projectFiles>
<extraFiles>
<directory name="vendor/christophwurst/nextcloud" />
<directory name="vendor/nextcloud/ocp" />
</extraFiles>
<issueHandlers>
<UndefinedClass>
Expand Down
2 changes: 1 addition & 1 deletion tests/psalm-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
<code>null</code>
</NullableReturnStatement>
</file>
<file src="vendor/christophwurst/nextcloud/OCP/BackgroundJob/TimedJob.php">
<file src="vendor/nextcloud/ocp/OCP/BackgroundJob/TimedJob.php">
<ImplementedParamTypeMismatch occurrences="1">
<code>$jobList</code>
</ImplementedParamTypeMismatch>
Expand Down