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.

Sign up for GitHub

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

fixing composer #313

Merged
merged 2 commits into from
Jan 22, 2024
Merged

fixing composer #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c3f80d
fixing composer
ArtificialOwl Jan 18, 2024
b7bacd6
fix phpunit
ArtificialOwl Jan 18, 2024
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
14 changes: 8 additions & 6 deletions .github/workflows/phpunit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
matrix:
php-versions: ['7.4']
databases: ['sqlite']
server-versions: ['stable20', 'stable21', 'stable22', 'stable23', 'stable24', 'master']
server-versions: ['stable20', 'stable21', 'stable22', 'stable23', 'stable24']

name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}

Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
matrix:
php-versions: ['7.4']
databases: ['mysql']
server-versions: ['master']
server-versions: ['stable24']

name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}

Expand Down Expand Up @@ -132,13 +132,13 @@ jobs:
matrix:
php-versions: ['7.4']
databases: ['pgsql']
server-versions: ['master']
server-versions: ['stable24']

name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
name: php${{ matrix.php-versions }}-${{ matrix.databases }}

services:
postgres:
image: postgres
image: postgres:14
ports:
- 4444:5432/tcp
env:
Expand Down Expand Up @@ -183,8 +183,10 @@ jobs:
run: |
mkdir data
./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
php -f index.php
./occ app:enable --force ${{ env.APP_NAME }}
php -S localhost:8080 &
# php -S localhost:8080 &

- name: PHPUnit
working-directory: apps/${{ env.APP_NAME }}
run: ./vendor/phpunit/phpunit/phpunit -c tests/phpunit.xml
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ocp-version: [ '20', '21', '22.0.0-RC1', '23.0.0-RC1', 'dev-master' ]
ocp-version: [ '20', '21', '22.0.0-RC1', '23.0.0-RC1', '24' ]
name: Nextcloud ${{ matrix.ocp-version }}
steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ For this app to be effective, the ClamAV virus definitions should be kept up to
<screenshot>https://raw.githubusercontent.com/nextcloud/files_antivirus/master/screenshots/1.png</screenshot>

<dependencies>
<nextcloud min-version="20" max-version="24" />
<nextcloud min-version="20" max-version="23" />
</dependencies>

<background-jobs>
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"require-dev": {
"christophwurst/nextcloud": "^v20.0.0",
"doctrine/dbal": "3.0.0",
"doctrine/dbal": "3.2.2",
"php-parallel-lint/php-parallel-lint": "^1.0",
"phpunit/phpunit": "^8",
"psalm/phar": "^4.3",
Expand Down
Loading
Loading