Skip to content

Commit a4a7799

Browse files
Merge pull request #1295 from nextcloud/migrate-stable23-christophwurst-package
Migrate to nextcloud/OCP package in stable23
2 parents 3db179b + a0d71b7 commit a4a7799

File tree

5 files changed

+167
-96
lines changed

5 files changed

+167
-96
lines changed

.github/workflows/psalm.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Static analysis
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- master
8+
- main
9+
- stable*
10+
11+
jobs:
12+
static-analysis:
13+
runs-on: ubuntu-latest
14+
15+
name: Nextcloud ${{ matrix.ocp-version }}
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v3
19+
20+
- name: Set up php
21+
uses: shivammathur/setup-php@v2
22+
with:
23+
php-version: 7.4
24+
coverage: none
25+
26+
- name: Install dependencies
27+
run: composer i
28+
29+
- name: Run coding standards check
30+
run: composer run psalm

.github/workflows/static-analysis.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# This workflow is provided via the organization template repository
2+
#
3+
# https://github.com/nextcloud/.github
4+
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
5+
6+
name: Update nextcloud/ocp
7+
8+
on:
9+
workflow_dispatch:
10+
schedule:
11+
- cron: "5 4 * * 0"
12+
13+
jobs:
14+
update-nextcloud-ocp:
15+
runs-on: ubuntu-latest
16+
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
branches: ["master", "stable25", "stable24", "stable23"]
21+
22+
name: update-nextcloud-ocp-${{ matrix.branches }}
23+
24+
steps:
25+
- uses: actions/checkout@v3
26+
with:
27+
ref: ${{ matrix.branches }}
28+
submodules: true
29+
30+
- name: Set up php7.4
31+
uses: shivammathur/setup-php@v2
32+
with:
33+
php-version: 7.4
34+
extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
35+
coverage: none
36+
37+
- name: Composer install
38+
run: composer install
39+
40+
- name: Composer update nextcloud/ocp
41+
run: composer require --dev nextcloud/ocp:dev-${{ matrix.branches }}
42+
continue-on-error: true
43+
44+
- name: Reset checkout dirs
45+
run: |
46+
git clean -f 3rdparty
47+
git clean -f vendor
48+
git checkout 3rdparty vendor
49+
continue-on-error: true
50+
51+
- name: Create Pull Request
52+
uses: peter-evans/create-pull-request@v3
53+
with:
54+
token: ${{ secrets.COMMAND_BOT_PAT }}
55+
commit-message: Update psalm baseline
56+
committer: GitHub <noreply@github.com>
57+
author: nextcloud-command <nextcloud-command@users.noreply.github.com>
58+
signoff: true
59+
branch: automated/noid/${{ matrix.branches }}-update-nextcloud-ocp
60+
title: "[${{ matrix.branches }}] Update nextcloud/ocp dependency"
61+
body: |
62+
Auto-generated update of [nextcloud/ocp](https://github.com/nextcloud-deps/ocp/) dependency
63+
labels: |
64+
dependencies
65+
3. to review

composer.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
{
22
"autoload-dev": {
33
"psr-4": {
4-
"OCP\\": "vendor/christophwurst/nextcloud/OCP",
4+
"OCP\\": "vendor/nextcloud/ocp/OCP",
55
"OCA\\Notifications\\": "lib/"
66
}
77
},
88
"name": "nextcloud/notifications",
99
"description": "notifications",
1010
"license": "AGPL",
11-
"require": {
12-
},
1311
"require-dev": {
1412
"phpunit/phpunit": "^9.5",
1513
"nextcloud/coding-standard": "^0.5.0",
16-
"christophwurst/nextcloud": "dev-master@dev",
17-
"vimeo/psalm": "^4.3.2"
14+
"vimeo/psalm": "^4.3.2",
15+
"nextcloud/ocp": "dev-stable23"
1816
},
1917
"config": {
2018
"optimize-autoloader": true,

composer.lock

Lines changed: 69 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)