Collaborative locking #54
+5,877
−365
There are no files selected for viewing
This file contains 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,120 @@ | ||
| name: Litmus | ||
|
|
||
| on: | ||
| pull_request: | ||
| push: | ||
| branches: | ||
| - master | ||
| - stable* | ||
|
|
||
| env: | ||
| APP_NAME: files_lock | ||
|
|
||
|
|
||
| jobs: | ||
| litmus: | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| php-versions: ['7.4'] | ||
| databases: ['mysql'] | ||
| server-versions: ['master'] | ||
|
|
||
| name: litmus ${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} | ||
|
|
||
| services: | ||
| postgres: | ||
| image: postgres | ||
| ports: | ||
| - 4445: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 | ||
| 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: Checkout server | ||
| uses: actions/checkout@v3 | ||
| 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@v3 | ||
| with: | ||
| path: apps/${{ env.APP_NAME }} | ||
|
|
||
| - name: Set up php ${{ matrix.php-versions }} | ||
| uses: shivammathur/setup-php@2.17.1 | ||
| with: | ||
| php-version: ${{ matrix.php-versions }} | ||
| tools: phpunit | ||
| extensions: zip, gd, mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, mysql, pdo_mysql, pgsql, pdo_pgsql | ||
| coverage: none | ||
| ini-values: zend.exception_ignore_args=0 | ||
|
|
||
| - name: Set up PHPUnit | ||
| working-directory: apps/${{ env.APP_NAME }} | ||
| run: composer i | ||
|
|
||
| - name: Set up Nextcloud | ||
| run: | | ||
| if [ "${{ matrix.databases }}" = "mysql" ]; then | ||
| export DB_PORT=4444 | ||
| elif [ "${{ matrix.databases }}" = "pgsql" ]; then | ||
| export DB_PORT=4445 | ||
| fi | ||
| 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 admin | ||
| ./occ app:enable --force ${{ env.APP_NAME }} | ||
| php -S localhost:8080 & | ||
|
|
||
| - name: Litmus | ||
| run: | | ||
| mkdir -p /tmp/litmus && \ | ||
| cp apps/files_lock/tests/litmus/0001-Comment-out-collection-locking-tests.patch /tmp/litmus/ && \ | ||
| wget -O /tmp/litmus/litmus-0.13.tar.gz http://www.webdav.org/neon/litmus/litmus-0.13.tar.gz && \ | ||
| cd /tmp/litmus && tar -xzf litmus-0.13.tar.gz | ||
|
|
||
| cd /tmp/litmus/litmus-0.13 | ||
| patch -p1 < ../0001-Comment-out-collection-locking-tests.patch | ||
| ./configure && make && rm -f /tmp/litmus-0.13.tar.gz | ||
|
|
||
| cd /tmp/litmus/litmus-0.13 | ||
| make URL=http://localhost:8080/remote.php/dav/files/admin CREDS="admin admin" TESTS="basic copymove props locks" check | ||
|
|
||
| - name: Dump Nextcloud log | ||
| if: failure() | ||
| run: cat data/nextcloud.log | ||
|
|
||
| - name: Upload litmus logs | ||
| uses: actions/upload-artifact@v2 | ||
| if: failure() | ||
| with: | ||
| name: Upload litmus log | ||
| path: /tmp/litmus/litmus-0.13/debug.log | ||
| retention-days: 5 | ||
|
|
||
| - name: Upload nextcloud logs | ||
| uses: actions/upload-artifact@v2 | ||
| if: failure() | ||
| with: | ||
| name: Upload nextcloud log | ||
| path: data/nextcloud.log | ||
| retention-days: 5 |
This file contains 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,93 @@ | ||
| name: PHPUnit | ||
|
|
||
| on: | ||
| pull_request: | ||
| push: | ||
| branches: | ||
| - master | ||
| - stable* | ||
|
|
||
| env: | ||
| APP_NAME: files_lock | ||
|
|
||
|
|
||
| jobs: | ||
| integration: | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| php-versions: ['7.4', '8.0', '8.1'] | ||
| databases: ['sqlite', 'mysql', 'pgsql'] | ||
| server-versions: ['master'] | ||
|
|
||
| name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} | ||
|
|
||
| services: | ||
| postgres: | ||
| image: postgres | ||
| ports: | ||
| - 4445: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 | ||
| 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: Checkout server | ||
| uses: actions/checkout@v3 | ||
| 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@v3 | ||
| with: | ||
| path: apps/${{ env.APP_NAME }} | ||
|
|
||
| - name: Set up php ${{ matrix.php-versions }} | ||
| uses: shivammathur/setup-php@2.17.1 | ||
| with: | ||
| php-version: ${{ matrix.php-versions }} | ||
| tools: phpunit | ||
| extensions: zip, gd, mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, mysql, pdo_mysql, pgsql, pdo_pgsql | ||
| coverage: none | ||
|
|
||
| - name: Set up PHPUnit | ||
| working-directory: apps/${{ env.APP_NAME }} | ||
| run: composer i | ||
|
|
||
| - name: Set up Nextcloud | ||
| run: | | ||
| if [ "${{ matrix.databases }}" = "mysql" ]; then | ||
| export DB_PORT=4444 | ||
| elif [ "${{ matrix.databases }}" = "pgsql" ]; then | ||
| export DB_PORT=4445 | ||
| fi | ||
| 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 admin | ||
| ./occ app:enable --force ${{ env.APP_NAME }} | ||
| php -S localhost:8080 & | ||
|
|
||
| - name: PHPUnit | ||
| working-directory: ./apps/${{ env.APP_NAME }} | ||
| run: ./vendor/phpunit/phpunit/phpunit -c tests/phpunit.xml | ||
|
|
||
| - name: Dump Nextcloud log | ||
| if: failure() | ||
| run: cat data/nextcloud.log |
This file contains 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 |
|---|---|---|
|
|
@@ -2,3 +2,6 @@ | |
| \.idea/ | ||
|
|
||
| vendor/ | ||
|
|
||
| .php-cs-fixer.cache | ||
| .phpunit.result.cache | ||
This file contains 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,19 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| require_once './vendor/autoload.php'; | ||
|
|
||
| use Nextcloud\CodingStandard\Config; | ||
|
|
||
| $config = new Config(); | ||
| $config | ||
| ->getFinder() | ||
| // ->ignoreVCSIgnored(true) | ||
| ->notPath('build') | ||
| ->notPath('l10n') | ||
| ->notPath('src') | ||
| ->notPath('node_modules') | ||
| ->notPath('vendor') | ||
| ->in(__DIR__); | ||
| return $config; |
This file contains 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
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.
Maybe we should explain that this specifies the lock type. It's pretty self explanatory but still.