summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2022-09-26 17:24:33 +0200
committerJoas Schilling <coding@schilljs.com>2022-09-26 17:51:47 +0200
commit8e7c742260030705778116222e4eb8cd4b2b5d67 (patch)
tree6149bdb83d741d4f56913ece40a7302aefee1c3d /.github
parentf2961f0c4bcd73d5ee24f65f034690f49ef10e84 (diff)
Migrate to nextcloud/OCP package in master
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/psalm.yml12
-rw-r--r--.github/workflows/update-nextcloud-ocp.yml (renamed from .github/workflows/update-christophwurst-nextcloud.yml)16
2 files changed, 11 insertions, 17 deletions
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
index 7248ad6e8..ff271c1e7 100644
--- a/.github/workflows/psalm.yml
+++ b/.github/workflows/psalm.yml
@@ -5,20 +5,17 @@ on:
push:
branches:
- master
+ - main
- stable*
jobs:
- static-psalm-analysis:
+ static-analysis:
runs-on: ubuntu-latest
- strategy:
- matrix:
- ocp-version: [ 'dev-master' ]
-
name: Nextcloud ${{ matrix.ocp-version }}
steps:
- name: Checkout
- uses: actions/checkout@master
+ uses: actions/checkout@v3
- name: Set up php
uses: shivammathur/setup-php@v2
@@ -29,8 +26,5 @@ jobs:
- 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-christophwurst-nextcloud.yml b/.github/workflows/update-nextcloud-ocp.yml
index 50c81c6f4..a396b6f87 100644
--- a/.github/workflows/update-christophwurst-nextcloud.yml
+++ b/.github/workflows/update-nextcloud-ocp.yml
@@ -3,7 +3,7 @@
# 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:
@@ -11,7 +11,7 @@ on:
- cron: "5 4 * * 0"
jobs:
- update-christophwurst-nextcloud:
+ update-nextcloud-ocp:
runs-on: ubuntu-latest
strategy:
@@ -19,7 +19,7 @@ jobs:
matrix:
branches: ["master", "stable25", "stable24", "stable23"]
- name: update-christophwurst-nextcloud-${{ matrix.branches }}
+ name: update-nextcloud-ocp-${{ matrix.branches }}
steps:
- uses: actions/checkout@v3
@@ -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
@@ -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