Skip to content

Commit 44ba440

Browse files
authored
NC25 compat (#149)
* Preparations for NC25 Signed-off-by: Robin Windey <ro.windey@gmail.com> * Set server version to stable25 for GitHub actions Signed-off-by: Robin Windey <ro.windey@gmail.com>
1 parent 978faee commit 44ba440

File tree

7 files changed

+9
-79
lines changed

7 files changed

+9
-79
lines changed

.github/release-drafter.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
matrix:
2121
php-versions: ['8.0']
2222
databases: ['sqlite']
23-
server-versions: ['stable24']
23+
server-versions: ['stable25']
2424

2525
name: php${{ matrix.php-versions }}-${{ matrix.databases }}-COVERAGE
2626

.github/workflows/lint.yml

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -29,56 +29,4 @@ jobs:
2929
coverage: none
3030

3131
- name: Lint
32-
run: composer run lint
33-
34-
nc-app-code-check:
35-
name: nc-app-code-check-${{ matrix.php-versions }}-${{ matrix.databases }}-CODECHECK
36-
runs-on: ubuntu-20.04
37-
38-
strategy:
39-
matrix:
40-
php-versions: ['8.1']
41-
databases: ['sqlite']
42-
server-versions: ['stable24']
43-
44-
steps:
45-
- name: Checkout server
46-
uses: actions/checkout@v2
47-
with:
48-
repository: nextcloud/server
49-
ref: ${{ matrix.server-versions }}
50-
51-
- name: Checkout submodules
52-
shell: bash
53-
run: |
54-
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
55-
git submodule sync --recursive
56-
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
57-
58-
- name: Checkout app
59-
uses: actions/checkout@v2
60-
with:
61-
path: apps/${{ env.APP_NAME }}
62-
63-
- name: Set up php ${{ matrix.php-versions }}
64-
uses: shivammathur/setup-php@v2
65-
with:
66-
php-version: ${{ matrix.php-versions }}
67-
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite
68-
coverage: none
69-
70-
- name: Install dependencies
71-
working-directory: apps/${{ env.APP_NAME }}
72-
run: composer i
73-
74-
- name: Set up Nextcloud
75-
env:
76-
DB_PORT: 4444
77-
run: |
78-
mkdir data
79-
./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
80-
./occ app:enable ${{ env.APP_NAME }}
81-
php -S localhost:8080 &
82-
83-
- name: Run NC app code-check
84-
run: php occ app:check-code ${{ env.APP_NAME }}
32+
run: composer run lint

.github/workflows/phpunit.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
matrix:
2121
php-versions: ['8.1']
2222
databases: ['sqlite']
23-
server-versions: ['stable24']
23+
server-versions: ['stable25']
2424

2525
name: php${{ matrix.php-versions }}-${{ matrix.databases }}
2626

@@ -76,7 +76,7 @@ jobs:
7676
matrix:
7777
php-versions: ['7.4', '8.0', '8.1']
7878
databases: ['mysql']
79-
server-versions: ['stable24']
79+
server-versions: ['stable25']
8080

8181
name: php${{ matrix.php-versions }}-${{ matrix.databases }}
8282

@@ -141,7 +141,7 @@ jobs:
141141
matrix:
142142
php-versions: ['8.1']
143143
databases: ['pgsql']
144-
server-versions: ['stable24']
144+
server-versions: ['stable25']
145145

146146
name: php${{ matrix.php-versions }}-${{ matrix.databases }}
147147

.github/workflows/release-drafter.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[![codecov](https://codecov.io/gh/R0Wi/workflow_ocr/branch/master/graph/badge.svg)](https://codecov.io/gh/R0Wi/workflow_ocr)
55
![Lint](https://github.com/R0Wi/workflow_ocr/workflows/Lint/badge.svg)
66
[![Generic badge](https://img.shields.io/github/v/release/R0Wi/workflow_ocr)](https://github.com/R0Wi/workflow_ocr/releases)
7-
[![Generic badge](https://img.shields.io/badge/Nextcloud-24-orange)](https://github.com/nextcloud/server)
7+
[![Generic badge](https://img.shields.io/badge/Nextcloud-25-orange)](https://github.com/nextcloud/server)
88

99
## Table of contents
1010

appinfo/info.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
The processing is done via workflow-engine and can therefore easily be customized.
99
Please note that you'll have to install the OcrMyPDF CLI on your Nextcloud server to
1010
process PDF files. More installation instructions can be found in the docs https://github.com/R0Wi/workflow_ocr/blob/master/README.md.</description>
11-
<version>1.24.0</version>
11+
<version>1.25.0</version>
1212
<licence>agpl</licence>
1313
<author mail="ro.windey@gmail.com">Robin Windey</author>
1414
<namespace>WorkflowOcr</namespace>
@@ -27,6 +27,7 @@
2727
<repository type="git">https://github.com/R0Wi/workflow_ocr.git</repository>
2828
<screenshot>https://github.com/R0Wi/workflow_ocr/blob/eb2d65e9610406bbab22c4c8dda1cea015b5c791/doc/img/usage_1.jpg?raw=true</screenshot>
2929
<dependencies>
30-
<nextcloud min-version="24" max-version="24" />
30+
<nextcloud min-version="25" max-version="25"/>
31+
<php min-version="7.4" max-version="8.1"/>
3132
</dependencies>
3233
</info>

0 commit comments

Comments
 (0)