From e156cea2420c4aa780c9bbac6309dbc963ca5431 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Sun, 2 Jun 2024 03:18:41 +0200 Subject: [PATCH 1/2] ci: Migrated litmus checks to GitHub Signed-off-by: Ferdinand Thiessen --- .github/workflows/integration-litmus.yml | 112 +++++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 .github/workflows/integration-litmus.yml diff --git a/.github/workflows/integration-litmus.yml b/.github/workflows/integration-litmus.yml new file mode 100644 index 0000000000000..d57bfbd9d7997 --- /dev/null +++ b/.github/workflows/integration-litmus.yml @@ -0,0 +1,112 @@ +# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: MIT +name: Litmus integration tests +on: + pull_request: + +concurrency: + group: integration-litmus-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +jobs: + changes: + runs-on: ubuntu-latest-low + + outputs: + src: ${{ steps.changes.outputs.src}} + + steps: + - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 + id: changes + continue-on-error: true + with: + filters: | + src: + - '.github/workflows/**' + - '3rdparty/**' + - '**/*.php' + - '**/lib/**' + - '**/tests/**' + - '**/vendor-bin/**' + - 'build/integration/**' + - '.php-cs-fixer.dist.php' + - 'composer.json' + - 'composer.lock' + + integration-litmus: + runs-on: ubuntu-latest + needs: changes + + if: needs.changes.outputs.src != 'false' && github.repository_owner != 'nextcloud-gmbh' + + strategy: + # do not stop on another job's failure + fail-fast: false + matrix: + php-versions: ['8.3'] + endpoint: ['webdav', 'dav'] + + name: Litmus WebDAV ${{ matrix.endpoint }} + + steps: + - name: Checkout server + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + with: + submodules: true + + - name: Set up php ${{ matrix.php-versions }} + uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2 + with: + php-version: ${{ matrix.php-versions }} + # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation + extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite + coverage: 'none' + ini-file: development + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Set up Nextcloud + run: | + mkdir data + ./occ maintenance:install \ + --verbose \ + --database=sqlite \ + --database-name=nextcloud \ + --database-user=root \ + --database-pass=rootpassword \ + --admin-user admin \ + --admin-pass admin + ./occ config:system:set trusted_domains 2 --value=host.docker.internal:8080 + + - name: Run Nextcloud + run: | + php -S 0.0.0.0:8080 & + + - name: Run Litmus test + run: | + docker run \ + --rm \ + --add-host=host.docker.internal:host-gateway \ + ghcr.io/nextcloud/continuous-integration-litmus-php8.3:latest \ + bash -c '\ + cd /tmp/litmus/litmus-0.13; + make URL=http://host.docker.internal:8080/remote.php/${{ matrix.endpoint }}${{ matrix.endpoint == 'dav' && '/files/admin' || ''}} CREDS="admin admin" TESTS="basic copymove props largefile" check; + status=$?; + cat debug.log; + exit $status;' + + - name: Print Nextcloud logs + if: always() + run: cat data/nextcloud.log + + integration-litmus-summary: + permissions: + contents: none + runs-on: ubuntu-latest-low + needs: [changes, integration-litmus] + + if: always() + + steps: + - name: Summary status + run: if ${{ needs.changes.outputs.src != 'false' && needs.integration-litmus.result != 'success' }}; then exit 1; fi \ No newline at end of file From dc9df43214450caac2f67d2fe938c8ee42524557 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Sun, 2 Jun 2024 04:19:20 +0200 Subject: [PATCH 2/2] ci: Migrate CalDAVTester CI scripts to GitHub We can finally shut of drone workers. Signed-off-by: Ferdinand Thiessen --- .drone.yml | 132 ----------------------- .github/workflows/integration-dav.yml | 125 +++++++++++++++++++++ .github/workflows/integration-litmus.yml | 2 +- build/files-checker.php | 1 - 4 files changed, 126 insertions(+), 134 deletions(-) delete mode 100644 .drone.yml create mode 100644 .github/workflows/integration-dav.yml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 66698f4455030..0000000000000 --- a/.drone.yml +++ /dev/null @@ -1,132 +0,0 @@ ---- -kind: pipeline -name: litmus - -# SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors -# SPDX-License-Identifier: AGPL-3.0-or-later - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: litmus-v1 - image: ghcr.io/nextcloud/continuous-integration-litmus-php8.3:latest - commands: - - bash tests/travis/install.sh sqlite - - bash apps/dav/tests/travis/litmus-v1/script.sh -- name: litmus-v2 - image: ghcr.io/nextcloud/continuous-integration-litmus-php8.3:latest - commands: - - bash tests/travis/install.sh sqlite - - bash apps/dav/tests/travis/litmus-v2/script.sh - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: caldavtester-new-endpoint - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: caldavtester-new-endpoint - image: ghcr.io/nextcloud/continuous-integration-litmus-php8.3:latest - commands: - - bash tests/travis/install.sh sqlite - - bash apps/dav/tests/travis/caldav/install.sh - - bash apps/dav/tests/travis/caldav/script-new-endpoint.sh - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: caldavtester-old-endpoint - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: caldavtester-old-endpoint - image: ghcr.io/nextcloud/continuous-integration-litmus-php8.3:latest - commands: - - bash tests/travis/install.sh sqlite - - bash apps/dav/tests/travis/caldav/install.sh - - bash apps/dav/tests/travis/caldav/script-old-endpoint.sh - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: carddavtester-new-endpoint - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: carddavtester-new-endpoint - image: ghcr.io/nextcloud/continuous-integration-litmus-php8.3:latest - commands: - - bash tests/travis/install.sh sqlite - - bash apps/dav/tests/travis/carddav/install.sh - - bash apps/dav/tests/travis/carddav/script-new-endpoint.sh - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: carddavtester-old-endpoint - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: carddavtester-old-endpoint - image: ghcr.io/nextcloud/continuous-integration-litmus-php8.3:latest - commands: - - bash tests/travis/install.sh sqlite - - bash apps/dav/tests/travis/carddav/install.sh - - bash apps/dav/tests/travis/carddav/script-old-endpoint.sh - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: signature -hmac: 06ddea3f1885983230fcc996e805245357ac90e39599ed11a70161a7c09746d7 - -... diff --git a/.github/workflows/integration-dav.yml b/.github/workflows/integration-dav.yml new file mode 100644 index 0000000000000..33dffd23c827d --- /dev/null +++ b/.github/workflows/integration-dav.yml @@ -0,0 +1,125 @@ +# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: MIT +name: DAV integration tests +on: + pull_request: + +concurrency: + group: integration-caldav-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +jobs: + changes: + runs-on: ubuntu-latest-low + + outputs: + src: ${{ steps.changes.outputs.src}} + + steps: + - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 + id: changes + continue-on-error: true + with: + filters: | + src: + - '.github/workflows/**' + - '3rdparty/**' + - '**/*.php' + - '**/lib/**' + - '**/tests/**' + - '**/vendor-bin/**' + - 'build/integration/**' + - '.php-cs-fixer.dist.php' + - 'composer.json' + - 'composer.lock' + + integration-caldav: + runs-on: ubuntu-latest + needs: changes + + if: needs.changes.outputs.src != 'false' && github.repository_owner != 'nextcloud-gmbh' + + strategy: + # do not stop on another job's failure + fail-fast: false + matrix: + php-versions: ['8.3'] + endpoint: ['old', 'new'] + service: ['CalDAV', 'CardDAV'] + + name: ${{ matrix.service }} (${{ matrix.endpoint }} endpoint) php${{ matrix.php-versions }} + + steps: + - name: Checkout server + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + with: + submodules: true + + - name: Set up php ${{ matrix.php-versions }} + uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2 + with: + php-version: ${{ matrix.php-versions }} + # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation + extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite + coverage: 'none' + ini-file: development + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Set up Python + uses: LizardByte/setup-python-action@master + with: + python-version: '2.7' + + - name: Set up CalDAVTester + run: | + git clone --depth=1 https://github.com/apple/ccs-caldavtester.git CalDAVTester + git clone --depth=1 https://github.com/apple/ccs-pycalendar.git pycalendar + + - name: Set up Nextcloud + run: | + mkdir data + ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin + # disable the trashbin, so recurrent deletion of the same object works + ./occ config:app:set dav calendarRetentionObligation --value=0 + # Prepare users + OC_PASS=user01 ./occ user:add --password-from-env user01 + OC_PASS=user02 ./occ user:add --password-from-env user02 + # Prepare calendars + ./occ dav:create-calendar user01 calendar + ./occ dav:create-calendar user01 shared + ./occ dav:create-calendar user02 calendar + # Prepare address books + ./occ dav:create-addressbook user01 addressbook + ./occ dav:create-addressbook user02 addressbook + + - name: Run Nextcloud + run: | + php -S localhost:8888 & + + - name: Run CalDAVTester + run: | + cp "apps/dav/tests/travis/caldavtest/serverinfo-${{ matrix.endpoint }}${{ matrix.endpoint == 'old' && (matrix.service == 'CardDAV' && '-carddav' || '-caldav') || '' }}-endpoint.xml" "apps/dav/tests/travis/caldavtest/serverinfo.xml" + pushd CalDAVTester + PYTHONPATH="../pycalendar/src" python testcaldav.py --print-details-onfail --basedir "../apps/dav/tests/travis/caldavtest" -o cdt.txt \ + "${{ matrix.service }}/current-user-principal.xml" \ + "${{ matrix.service }}/sync-report.xml" \ + ${{ matrix.endpoint == 'new' && format('{0}/sharing-{1}.xml', matrix.service, matrix.service == 'CalDAV' && 'calendars' || 'addressbooks') || ';' }} + popd + + - name: Print Nextcloud logs + if: always() + run: | + cat data/nextcloud.log + + caldav-integration-summary: + permissions: + contents: none + runs-on: ubuntu-latest-low + needs: [changes, integration-caldav] + + if: always() + + steps: + - name: Summary status + run: if ${{ needs.changes.outputs.src != 'false' && needs.integration-caldav.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/integration-litmus.yml b/.github/workflows/integration-litmus.yml index d57bfbd9d7997..3ce974d4b4cca 100644 --- a/.github/workflows/integration-litmus.yml +++ b/.github/workflows/integration-litmus.yml @@ -109,4 +109,4 @@ jobs: steps: - name: Summary status - run: if ${{ needs.changes.outputs.src != 'false' && needs.integration-litmus.result != 'success' }}; then exit 1; fi \ No newline at end of file + run: if ${{ needs.changes.outputs.src != 'false' && needs.integration-litmus.result != 'success' }}; then exit 1; fi diff --git a/build/files-checker.php b/build/files-checker.php index d7b683904d5ad..17216399ca4fa 100644 --- a/build/files-checker.php +++ b/build/files-checker.php @@ -8,7 +8,6 @@ '.', '..', '.devcontainer', - '.drone.yml', '.editorconfig', '.eslintignore', '.eslintrc.js',