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

Prepare for NC30 #246

Merged
merged 1 commit into from
Apr 27, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
backport:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
name: Backport
steps:
- name: Backport
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:

jobs:
build_and_publish:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -30,7 +30,7 @@ jobs:

- name: Set up npm ${{ steps.versions.outputs.npmVersion }}
run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"

- name: Run build
run: cd ${{ env.APP_NAME }} && make appstore

Expand All @@ -40,7 +40,7 @@ jobs:
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{ env.APP_NAME }}/build/artifacts/appstore/${{ env.APP_NAME }}.tar.gz
asset_name: ${{ env.APP_NAME }}.tar.gz
asset_name: ${{ env.APP_NAME }}.tar.gz
tag: ${{ github.ref }}
overwrite: true

Expand All @@ -51,4 +51,4 @@ jobs:
appstore_token: ${{ secrets.APPSTORE_TOKEN }}
download_url: ${{ steps.attach_to_release.outputs.browser_download_url }}
app_private_key: ${{ secrets.APP_PRIVATE_KEY }}
nightly: ${{ github.event.release.prerelease }}
nightly: ${{ github.event.release.prerelease }}
4 changes: 2 additions & 2 deletions .github/workflows/dependabot-approve.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ on: pull_request

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: hmarr/auto-approve-action@v2.0.0
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
github-token: "${{ secrets.GITHUB_TOKEN }}"
4 changes: 2 additions & 2 deletions .github/workflows/lint-fix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ on:
jobs:
php-cs-fixer:
name: php-cs-fixer
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

strategy:
matrix:
php-versions: ['8.1']
php-versions: ['8.2']

steps:
- name: Checkout
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ env:

jobs:
php:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

strategy:
matrix:
php-versions: ['8.1', '8.2', '8.3']
php-versions: ['8.2', '8.3']

name: php${{ matrix.php-versions }}-LINT
steps:
Expand All @@ -29,4 +29,4 @@ jobs:
coverage: none

- name: Lint
run: composer run lint
run: composer run lint
16 changes: 8 additions & 8 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ env:

jobs:
sqlite:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

strategy:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['8.1']
php-versions: ['8.3']
databases: ['sqlite']
server-versions: ['master']

Expand All @@ -37,12 +37,12 @@ jobs:
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
git submodule sync --recursive
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1

- name: Checkout app
uses: actions/checkout@v4
with:
path: apps/${{ env.APP_NAME }}

- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2
with:
Expand All @@ -68,13 +68,13 @@ jobs:
run: make php-test

mysql:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

strategy:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['8.1', '8.2', '8.3']
php-versions: ['8.2', '8.3']
databases: ['mysql']
server-versions: ['master']

Expand Down Expand Up @@ -133,13 +133,13 @@ jobs:
run: make php-test

pgsql:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

strategy:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['8.1']
php-versions: ['8.3']
databases: ['pgsql']
server-versions: ['master']

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarqube.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:

jobs:
php:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

strategy:
# do not stop on another job's failure
Expand Down
64 changes: 32 additions & 32 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,44 @@
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=R0Wi_workflow_ocr&metric=coverage)](https://sonarcloud.io/summary/new_code?id=R0Wi_workflow_ocr)
![Lint](https://github.com/R0Wi/workflow_ocr/workflows/Lint/badge.svg)
[![Generic badge](https://img.shields.io/github/v/release/R0Wi/workflow_ocr)](https://github.com/R0Wi/workflow_ocr/releases)
[![Generic badge](https://img.shields.io/badge/Nextcloud-29-orange)](https://github.com/nextcloud/server)
[![Generic badge](https://img.shields.io/badge/Nextcloud-30-orange)](https://github.com/nextcloud/server)

[!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/R0Wi)

## Table of contents

- [Nextcloud Workflow OCR app](#nextcloud-workflow-ocr-app)
- [Table of contents](#table-of-contents)
- [Setup](#setup)
- [App installation](#app-installation)
- [Nextcloud background jobs](#nextcloud-background-jobs)
- [Backend](#backend)
- [Usage](#usage)
- [Useful triggers](#useful-triggers)
- [Trigger OCR if file was created or updated](#trigger-ocr-if-file-was-created-or-updated)
- [Trigger OCR on tag assigning](#trigger-ocr-on-tag-assigning)
- [Settings](#settings)
- [Per workflow settings](#per-workflow-settings)
- [Global settings](#global-settings)
- [Testing your configuration](#testing-your-configuration)
- [Get feedback via Notifications](#get-feedback-via-notifications)
- [How it works](#how-it-works)
- [General](#general)
- [PDF](#pdf)
- [Images](#images)
- [Troubleshooting](#troubleshooting)
- [Generic troubleshooting guide](#generic-troubleshooting-guide)
- [The Nextcloud Workflowengine](#the-nextcloud-workflowengine)
- [Development](#development)
- [Dev setup](#dev-setup)
- [Debugging](#debugging)
- [`docker`-based setup](#docker-based-setup)
- [Executing tests](#executing-tests)
- [Adding a new `OcrProcessor`](#adding-a-new-ocrprocessor)
- [Events emitted by the app](#events-emitted-by-the-app)
- [`TextRecognizedEvent`](#textrecognizedevent)
- [Limitations](#limitations)
- [Used libraries \& components](#used-libraries--components)
- [Table of contents](#table-of-contents)
- [Setup](#setup)
- [App installation](#app-installation)
- [Nextcloud background jobs](#nextcloud-background-jobs)
- [Backend](#backend)
- [Usage](#usage)
- [Useful triggers](#useful-triggers)
- [Trigger OCR if file was created or updated](#trigger-ocr-if-file-was-created-or-updated)
- [Trigger OCR on tag assigning](#trigger-ocr-on-tag-assigning)
- [Settings](#settings)
- [Per workflow settings](#per-workflow-settings)
- [Global settings](#global-settings)
- [Testing your configuration](#testing-your-configuration)
- [Get feedback via Notifications](#get-feedback-via-notifications)
- [How it works](#how-it-works)
- [General](#general)
- [PDF](#pdf)
- [Images](#images)
- [Troubleshooting](#troubleshooting)
- [Generic troubleshooting guide](#generic-troubleshooting-guide)
- [The Nextcloud Workflowengine](#the-nextcloud-workflowengine)
- [Development](#development)
- [Dev setup](#dev-setup)
- [Debugging](#debugging)
- [`docker`-based setup](#docker-based-setup)
- [Executing tests](#executing-tests)
- [Adding a new `OcrProcessor`](#adding-a-new-ocrprocessor)
- [Events emitted by the app](#events-emitted-by-the-app)
- [`TextRecognizedEvent`](#textrecognizedevent)
- [Limitations](#limitations)
- [Used libraries \& components](#used-libraries--components)

## Setup
### App installation
Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
The processing is done via workflow-engine and can therefore easily be customized.
Please note that you'll have to install the OcrMyPDF CLI on your Nextcloud server to
process PDF files. More installation instructions can be found in the docs https://github.com/R0Wi/workflow_ocr/blob/master/README.md.</description>
<version>1.29.0</version>
<version>1.30.0</version>
<licence>agpl</licence>
<author mail="ro.windey@gmail.com">Robin Windey</author>
<namespace>WorkflowOcr</namespace>
Expand All @@ -27,7 +27,7 @@
<repository type="git">https://github.com/R0Wi/workflow_ocr.git</repository>
<screenshot>https://github.com/R0Wi/workflow_ocr/blob/eb2d65e9610406bbab22c4c8dda1cea015b5c791/doc/img/usage_1.jpg?raw=true</screenshot>
<dependencies>
<nextcloud min-version="29" max-version="29"/>
<nextcloud min-version="30" max-version="30"/>
<php min-version="8.1" max-version="8.3"/>
</dependencies>
</info>
Loading