Skip to content

Update stable22 target versions #435

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

Merged
nickvergessen merged 1 commit into from
Jun 29, 2021
Merged

Update stable22 target versions #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
73 changes: 0 additions & 73 deletions .github/workflows/oci.yml
View file
Open in desktop

This file was deleted.

92 changes: 80 additions & 12 deletions .github/workflows/phpunit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,16 @@ jobs:
matrix:
php-versions: ['7.4']
databases: ['sqlite']

name: php${{ matrix.php-versions }}-${{ matrix.databases }}
server-versions: ['stable22']
Copy link
Member

@skjnldsv skjnldsv Jun 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My using matric is forces to change the tests checks for every branch :(

Copy link
Member Author

@nickvergessen nickvergessen Jun 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess in this app it doesn't matter. But it becomes a problem if someone does a PR to your PR, because then the base_ref does not exist on server.

Since the "change it on every branch" is automated by nickv-bot I don't mind if you don't

Copy link
Member

@skjnldsv skjnldsv Jun 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess in this app it doesn't matter. But it becomes a problem if someone does a PR to your PR, because then the base_ref does not exist on server.

Such a specific use case, it should be fine I think :)
In any case, how do you manage all those branchs checks differences in the github branch protection?
One rule per stable?

Copy link
Member Author

@nickvergessen nickvergessen Jun 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most apps protect stable[0-9][0-9]


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

steps:
- name: Checkout server
uses: actions/checkout@v2
with:
repository: nextcloud/server
ref: ${{ github.base_ref }}
ref: ${{ matrix.server-versions }}

- name: Checkout submodules
shell: bash
Expand Down Expand Up @@ -58,7 +59,7 @@ jobs:
DB_PORT: 4444
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
./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
./occ app:enable --force ${{ env.APP_NAME }}
php -S localhost:8080 &

Expand All @@ -79,8 +80,9 @@ jobs:
matrix:
php-versions: ['7.3', '7.4']
databases: ['mysql']

name: php${{ matrix.php-versions }}-${{ matrix.databases }}
server-versions: ['stable22']

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

services:
mysql:
Expand All @@ -96,7 +98,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: nextcloud/server
ref: ${{ github.base_ref }}
ref: ${{ matrix.server-versions }}

- name: Checkout submodules
shell: bash
Expand Down Expand Up @@ -127,7 +129,7 @@ jobs:
DB_PORT: 4444
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
./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
./occ app:enable --force ${{ env.APP_NAME }}
php -S localhost:8080 &

Expand All @@ -148,8 +150,9 @@ jobs:
matrix:
php-versions: ['7.4']
databases: ['pgsql']

name: php${{ matrix.php-versions }}-${{ matrix.databases }}
server-versions: ['stable22']

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

services:
postgres:
Expand All @@ -167,7 +170,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: nextcloud/server
ref: ${{ github.base_ref }}
ref: ${{ matrix.server-versions }}

- name: Checkout submodules
shell: bash
Expand Down Expand Up @@ -198,7 +201,7 @@ jobs:
DB_PORT: 4444
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
./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
./occ app:enable --force ${{ env.APP_NAME }}
php -S localhost:8080 &

Expand All @@ -209,3 +212,68 @@ jobs:
# - name: PHPUnit integration
# working-directory: apps/${{ env.APP_NAME }}
# run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml

oci:
runs-on: ubuntu-latest

strategy:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['7.4']
databases: ['oci']
server-versions: ['stable22']

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

services:
oracle:
image: deepdiver/docker-oracle-xe-11g # "wnameless/oracle-xe-11g-r2"
ports:
- "1521:1521"

steps:
- name: Checkout server
uses: actions/checkout@v2
with:
repository: nextcloud/server
ref: ${{ matrix.server-versions }}

- name: Checkout submodules
shell: bash
run: |
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@v2
with:
path: apps/${{ env.APP_NAME }}

- name: Set up PHPUnit
working-directory: apps/${{ env.APP_NAME }}
run: composer i

- name: Set up php ${{ matrix.php-versions }}
uses: "shivammathur/setup-php@v2"
with:
php-version: "${{ matrix.php-versions }}"
extensions: mbstring, iconv, fileinfo, intl, oci8
tools: phpunit:8.5.2
coverage: none

- name: Set up Nextcloud
run: |
mkdir data
./occ maintenance:install --verbose --database=oci --database-name=XE --database-host=127.0.0.1 --database-port=1521 --database-user=autotest --database-pass=owncloud --admin-user admin --admin-pass admin
php -f index.php
./occ app:enable --force ${{ env.APP_NAME }}

- name: PHPUnit
working-directory: apps/${{ env.APP_NAME }}
run: phpunit -c phpunit.xml

# - name: PHPUnit integration
# working-directory: apps/${{ env.APP_NAME }}
# run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml