Skip to content

Commit

Permalink
Merge pull request #117 from nextcloud/migrate-stable25-christophwurs…
Browse files Browse the repository at this point in the history
…t-package

Migrate to nextcloud/OCP package in stable25
  • Loading branch information
come-nc authored Oct 2, 2022
2 parents 0d0c54b + dba15a3 commit 80ee970
Show file tree
Hide file tree
Showing 5 changed files with 91 additions and 84 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/psalm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# 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: Static analysis

on:
pull_request:
push:
branches:
- master
- main
- stable*

jobs:
static-analysis:
runs-on: ubuntu-latest

name: Nextcloud
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.

Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
# https://github.com/nextcloud/.github
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization

name: Update christophwurst/nextcloud
name: Update nextcloud/ocp

on:
workflow_dispatch:
schedule:
- cron: "5 4 * * 0"
- cron: "5 2 * * 0"

jobs:
update-christophwurst-nextcloud:
update-nextcloud-ocp:
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
branches: ["master", "stable25", "stable24", "stable23"]

name: update-christophwurst-nextcloud-${{ matrix.branches }}
name: update-nextcloud-ocp-${{ matrix.branches }}

steps:
- uses: actions/checkout@v3
Expand All @@ -37,8 +37,8 @@ jobs:
- name: Composer install
run: composer install

- name: Composer update christophwurst/nextcloud
run: composer require --dev christophwurst/nextcloud:dev-${{ matrix.branches }}
- name: Composer update nextcloud/ocp
run: composer require --dev nextcloud/ocp:dev-${{ matrix.branches }}
continue-on-error: true

- name: Reset checkout dirs
Expand All @@ -56,10 +56,10 @@ jobs:
committer: GitHub <noreply@github.com>
author: nextcloud-command <nextcloud-command@users.noreply.github.com>
signoff: true
branch: automated/noid/${{ matrix.branches }}-update-christophwurst-nextcloud
title: "[${{ matrix.branches }}] Update christophwurst/nextcloud dependency"
branch: automated/noid/${{ matrix.branches }}-update-nextcloud-ocp
title: "[${{ matrix.branches }}] Update nextcloud/ocp dependency"
body: |
Auto-generated update of [christophwurst/nextcloud](https://github.com/ChristophWurst/nextcloud_composer/) dependency
Auto-generated update of [nextcloud/ocp](https://github.com/nextcloud-deps/ocp/) dependency
labels: |
dependencies
3. to review
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"autoload-dev": {
"psr-4": {
"OCP\\": "vendor/christophwurst/nextcloud/OCP",
"OCP\\": "vendor/nextcloud/ocp/OCP",
"OCA\\Notifications\\": "lib/"
}
},
Expand All @@ -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,
Expand Down
90 changes: 44 additions & 46 deletions composer.lock

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

0 comments on commit 80ee970

Please sign in to comment.