-
Notifications
You must be signed in to change notification settings - Fork 68
Use new PHPUnit CI setup from nextcloud/.github #777
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| name: PHPUnit | ||
|
|
||
| on: | ||
| pull_request: | ||
| push: | ||
| branches: | ||
| - master | ||
| - stable* | ||
|
|
||
| env: | ||
| # Location of the phpunit.xml and phpunit.integration.xml files | ||
| PHPUNIT_CONFIG: ./tests/phpunit.xml | ||
| PHPUNIT_INTEGRATION_CONFIG: ./tests/phpunit.integration.xml | ||
|
|
||
| jobs: | ||
| phpunit-mysql: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| strategy: | ||
| matrix: | ||
| php-versions: ['7.4', '8.0', '8.1'] | ||
| server-versions: ['master'] | ||
|
|
||
| services: | ||
| mysql: | ||
| image: mariadb:10.5 | ||
| ports: | ||
| - 4444:3306/tcp | ||
| env: | ||
| MYSQL_ROOT_PASSWORD: rootpassword | ||
| options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5 | ||
|
|
||
| steps: | ||
| - name: Set app env | ||
| run: | | ||
| # Split and keep last | ||
| echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV | ||
|
|
||
| - name: Enable ONLY_FULL_GROUP_BY MySQL option | ||
| run: | | ||
| echo "SET GLOBAL sql_mode=(SELECT CONCAT(@@sql_mode,',ONLY_FULL_GROUP_BY'));" | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword | ||
| echo "SELECT @@sql_mode;" | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword | ||
|
|
||
| - name: Checkout server | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| submodules: true | ||
| repository: nextcloud/server | ||
| ref: ${{ matrix.server-versions }} | ||
|
|
||
| - name: Checkout app | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| path: apps/${{ env.APP_NAME }} | ||
|
|
||
| - name: Set up php ${{ matrix.php-versions }} | ||
| uses: shivammathur/setup-php@v2 | ||
| with: | ||
| php-version: ${{ matrix.php-versions }} | ||
| tools: phpunit | ||
| extensions: mbstring, iconv, fileinfo, intl, mysql, pdo_mysql | ||
| coverage: none | ||
|
|
||
| - name: Set up PHPUnit | ||
| working-directory: apps/${{ env.APP_NAME }} | ||
| run: composer i | ||
|
|
||
| - name: Set up Nextcloud | ||
| env: | ||
| DB_PORT: 4444 | ||
| run: | | ||
| mkdir data | ||
| ./occ maintenance:install --verbose --database=mysql --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 ${{ env.APP_NAME }} | ||
|
|
||
| - name: Check PHPUnit config file existence | ||
| id: check_phpunit | ||
| uses: andstor/file-existence-action@v1 | ||
| with: | ||
| files: apps/${{ env.APP_NAME }}/${{ env.PHPUNIT_CONFIG }} | ||
|
|
||
| - name: Run Nextcloud | ||
| run: php -S localhost:8080 & | ||
|
|
||
| - name: PHPUnit | ||
| # Only run if phpunit config file exists | ||
| if: steps.check_phpunit.outputs.files_exists == 'true' | ||
| working-directory: apps/${{ env.APP_NAME }} | ||
| run: ./vendor/phpunit/phpunit/phpunit -c ${{ env.PHPUNIT_CONFIG }} | ||
|
|
||
| - name: Check PHPUnit integration config file existence | ||
| id: check_integration | ||
| uses: andstor/file-existence-action@v1 | ||
| with: | ||
| files: apps/${{ env.APP_NAME }}/${{ env.PHPUNIT_INTEGRATION_CONFIG }} | ||
|
|
||
| - name: PHPUnit integration | ||
| # Only run if phpunit integration config file exists | ||
| if: steps.check_integration.outputs.files_exists == 'true' | ||
| working-directory: apps/${{ env.APP_NAME }} | ||
| run: ./vendor/phpunit/phpunit/phpunit -c ${{ env.PHPUNIT_INTEGRATION_CONFIG }} | ||
|
|
||
| summary: | ||
| runs-on: ubuntu-latest | ||
| needs: phpunit-mysql | ||
|
|
||
| if: always() | ||
|
|
||
| name: phpunit-mysql-summary | ||
|
|
||
| steps: | ||
| - name: Summary status | ||
| run: if ${{ needs.phpunit-mysql.result != 'success' }}; then exit 1; fi | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| name: PHPUnit | ||
|
|
||
| on: | ||
| pull_request: | ||
| push: | ||
| branches: | ||
| - master | ||
| - stable* | ||
|
|
||
| env: | ||
| # Location of the phpunit.xml and phpunit.integration.xml files | ||
| PHPUNIT_CONFIG: ./tests/phpunit.xml | ||
| PHPUNIT_INTEGRATION_CONFIG: ./tests/phpunit.integration.xml | ||
|
|
||
| jobs: | ||
| phpunit-oci: | ||
| runs-on: ubuntu-20.04 | ||
|
|
||
| strategy: | ||
| matrix: | ||
| php-versions: ['8.0'] | ||
| server-versions: ['master'] | ||
|
|
||
| services: | ||
| oracle: | ||
| image: deepdiver/docker-oracle-xe-11g # 'wnameless/oracle-xe-11g-r2' | ||
| ports: | ||
| - 1521:1521/tcp | ||
|
|
||
| steps: | ||
| - name: Set app env | ||
| run: | | ||
| # Split and keep last | ||
| echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV | ||
|
|
||
| - name: Checkout server | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| submodules: true | ||
| repository: nextcloud/server | ||
| ref: ${{ matrix.server-versions }} | ||
|
|
||
| - name: Checkout app | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| path: apps/${{ env.APP_NAME }} | ||
|
|
||
| - name: Set up php ${{ matrix.php-versions }} | ||
| uses: shivammathur/setup-php@v2 | ||
| with: | ||
| php-version: ${{ matrix.php-versions }} | ||
| extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, oci8 | ||
| tools: phpunit | ||
| coverage: none | ||
|
|
||
| - name: Set up PHPUnit | ||
| working-directory: apps/${{ env.APP_NAME }} | ||
| run: composer i | ||
|
|
||
| - name: Set up Nextcloud | ||
| env: | ||
| DB_PORT: 1521 | ||
| run: | | ||
| mkdir data | ||
| ./occ maintenance:install --verbose --database=oci --database-name=XE --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=autotest --database-pass=owncloud --admin-user admin --admin-pass admin | ||
| ./occ app:enable ${{ env.APP_NAME }} | ||
|
|
||
| - name: Check PHPUnit config file existence | ||
| id: check_phpunit | ||
| uses: andstor/file-existence-action@v1 | ||
| with: | ||
| files: apps/${{ env.APP_NAME }}/${{ env.PHPUNIT_CONFIG }} | ||
|
|
||
| - name: PHPUnit | ||
| # Only run if phpunit config file exists | ||
| if: steps.check_phpunit.outputs.files_exists == 'true' | ||
| working-directory: apps/${{ env.APP_NAME }} | ||
| run: ./vendor/phpunit/phpunit/phpunit -c ${{ env.PHPUNIT_CONFIG }} | ||
|
|
||
| - name: Check PHPUnit integration config file existence | ||
| id: check_integration | ||
| uses: andstor/file-existence-action@v1 | ||
| with: | ||
| files: apps/${{ env.APP_NAME }}/${{ env.PHPUNIT_INTEGRATION_CONFIG }} | ||
|
|
||
| - name: Run Nextcloud | ||
| # Only run if phpunit integration config file exists | ||
| if: steps.check_integration.outputs.files_exists == 'true' | ||
| run: php -S localhost:8080 & | ||
|
|
||
| - name: PHPUnit integration | ||
| # Only run if phpunit integration config file exists | ||
| if: steps.check_integration.outputs.files_exists == 'true' | ||
| working-directory: apps/${{ env.APP_NAME }} | ||
| run: ./vendor/phpunit/phpunit/phpunit -c ${{ env.PHPUNIT_INTEGRATION_CONFIG }} | ||
|
|
||
| summary: | ||
| runs-on: ubuntu-latest | ||
| needs: phpunit-oci | ||
|
|
||
| if: always() | ||
|
|
||
| name: phpunit-oci-summary | ||
|
|
||
| steps: | ||
| - name: Summary status | ||
| run: if ${{ needs.phpunit-oci.result != 'success' }}; then exit 1; fi |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| name: PHPUnit | ||
|
|
||
| on: | ||
| pull_request: | ||
| push: | ||
| branches: | ||
| - master | ||
| - stable* | ||
|
|
||
| env: | ||
| # Location of the phpunit.xml and phpunit.integration.xml files | ||
| PHPUNIT_CONFIG: ./tests/phpunit.xml | ||
| PHPUNIT_INTEGRATION_CONFIG: ./tests/phpunit.integration.xml | ||
|
|
||
| jobs: | ||
| phpunit-pgsql: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| strategy: | ||
| matrix: | ||
| php-versions: ['8.0'] | ||
| server-versions: ['master'] | ||
|
|
||
| services: | ||
| postgres: | ||
| image: postgres | ||
| ports: | ||
| - 4444:5432/tcp | ||
| env: | ||
| POSTGRES_USER: root | ||
| POSTGRES_PASSWORD: rootpassword | ||
| POSTGRES_DB: nextcloud | ||
| options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5 | ||
|
|
||
| steps: | ||
| - name: Set app env | ||
| run: | | ||
| # Split and keep last | ||
| echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV | ||
|
|
||
| - name: Checkout server | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| submodules: true | ||
| repository: nextcloud/server | ||
| ref: ${{ matrix.server-versions }} | ||
|
|
||
| - name: Checkout app | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| path: apps/${{ env.APP_NAME }} | ||
|
|
||
| - name: Set up php ${{ matrix.php-versions }} | ||
| uses: shivammathur/setup-php@v2 | ||
| with: | ||
| php-version: ${{ matrix.php-versions }} | ||
| tools: phpunit | ||
| extensions: mbstring, iconv, fileinfo, intl, pgsql, pdo_pgsql | ||
| coverage: none | ||
|
|
||
| - name: Set up PHPUnit | ||
| working-directory: apps/${{ env.APP_NAME }} | ||
| run: composer i | ||
|
|
||
| - name: Set up Nextcloud | ||
| env: | ||
| DB_PORT: 4444 | ||
| run: | | ||
| mkdir data | ||
| ./occ maintenance:install --verbose --database=pgsql --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 ${{ env.APP_NAME }} | ||
|
|
||
| - name: Check PHPUnit config file existence | ||
| id: check_phpunit | ||
| uses: andstor/file-existence-action@v1 | ||
| with: | ||
| files: apps/${{ env.APP_NAME }}/${{ env.PHPUNIT_CONFIG }} | ||
|
|
||
| - name: PHPUnit | ||
| # Only run if phpunit config file exists | ||
| if: steps.check_phpunit.outputs.files_exists == 'true' | ||
| working-directory: apps/${{ env.APP_NAME }} | ||
| run: ./vendor/phpunit/phpunit/phpunit -c ${{ env.PHPUNIT_CONFIG }} | ||
|
|
||
| - name: Check PHPUnit integration config file existence | ||
| id: check_integration | ||
| uses: andstor/file-existence-action@v1 | ||
| with: | ||
| files: apps/${{ env.APP_NAME }}/${{ env.PHPUNIT_INTEGRATION_CONFIG }} | ||
|
|
||
| - name: Run Nextcloud | ||
| # Only run if phpunit integration config file exists | ||
| if: steps.check_integration.outputs.files_exists == 'true' | ||
| run: php -S localhost:8080 & | ||
|
|
||
| - name: PHPUnit integration | ||
| # Only run if phpunit integration config file exists | ||
| if: steps.check_integration.outputs.files_exists == 'true' | ||
| working-directory: apps/${{ env.APP_NAME }} | ||
| run: ./vendor/phpunit/phpunit/phpunit -c ${{ env.PHPUNIT_INTEGRATION_CONFIG }} | ||
|
|
||
| summary: | ||
| runs-on: ubuntu-latest | ||
| needs: phpunit-pgsql | ||
|
|
||
| if: always() | ||
|
|
||
| name: phpunit-pgsql-summary | ||
|
|
||
| steps: | ||
| - name: Summary status | ||
| run: if ${{ needs.phpunit-pgsql.result != 'success' }}; then exit 1; fi |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
biggest difference is the location.
This used to get called from:
This comment was marked as outdated.
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure what I tested, but now I can reproduce it with this change.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The actual problem is here:
https://github.com/nextcloud/server/blob/eede608c0e9cd313bc672df1f0e37aca2a0ef2ad/lib/private/legacy/OC_App.php#L632
vs.
so in the first case
https://github.com/nextcloud/server/blob/eede608c0e9cd313bc672df1f0e37aca2a0ef2ad/lib/private/legacy/OC_App.php#L635-L636
is entered and then throws, while in the second case we continue with $topFolder = '.' ....
I guess the function needs some special handling for CLI cases or at least should not throw....
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix in nextcloud/server#31876