diff options
Diffstat (limited to '.github')
-rw-r--r-- | .github/CODEOWNERS | 1 | ||||
-rw-r--r-- | .github/ISSUE_TEMPLATE/BUG_REPORT.yml | 22 | ||||
-rw-r--r-- | .github/workflows/autocheckers.yml | 2 | ||||
-rw-r--r-- | .github/workflows/cypress.yml | 7 | ||||
-rw-r--r-- | .github/workflows/integration-dav.yml | 2 | ||||
-rw-r--r-- | .github/workflows/integration-litmus.yml | 2 | ||||
-rw-r--r-- | .github/workflows/integration-sqlite.yml | 3 | ||||
-rw-r--r-- | .github/workflows/object-storage-azure.yml | 2 | ||||
-rw-r--r-- | .github/workflows/object-storage-s3.yml | 2 | ||||
-rw-r--r-- | .github/workflows/object-storage-swift.yml | 2 | ||||
-rw-r--r-- | .github/workflows/openapi.yml | 2 | ||||
-rw-r--r-- | .github/workflows/phpunit-memcached.yml | 2 | ||||
-rw-r--r-- | .github/workflows/phpunit-mysql-sharding.yml | 184 | ||||
-rw-r--r-- | .github/workflows/phpunit-nodb.yml | 2 | ||||
-rw-r--r-- | .github/workflows/phpunit-sqlite.yml | 2 |
15 files changed, 207 insertions, 30 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f1983388e2f..e448bf922ce 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -26,6 +26,7 @@ /apps/user_ldap/appinfo/info.xml @come-nc @blizzz /apps/user_status/appinfo/info.xml @Antreesy @nickvergessen /apps/weather_status/appinfo/info.xml @julien-nc @juliushaertl +/apps/webhook_listeners/appinfo/info.xml @come-nc @julien-nc /apps/workflowengine/appinfo/info.xml @blizzz @juliushaertl # Frontend expertise diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml index d5038c03f23..b9516564af0 100644 --- a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml +++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml @@ -63,22 +63,6 @@ body: validations: required: true - type: dropdown - id: install-method - attributes: - label: Installation method - description: | - Select installation method you've used. - _Describe the method in the "Additional info" section if you chose "Other"._ - options: - - "Community Web installer on a VPS or web space" - - "Community Manual installation with Archive" - - "Community Docker image" - - "Community NextcloudPi appliance" - - "Community SNAP package" - - "Community VM appliance" - - "Other Community project" - - "Official All-in-One appliance" - - type: dropdown id: nextcloud-version attributes: label: Nextcloud Server version @@ -110,10 +94,10 @@ body: Select PHP engine version serving Nextcloud Server. _Describe in the "Additional info" section if you chose "Other"._ options: - - "PHP 8.0" - - "PHP 8.1" - - "PHP 8.2" - "PHP 8.3" + - "PHP 8.2" + - "PHP 8.1" + - "PHP 8.0" - "Other" - type: dropdown id: webserver diff --git a/.github/workflows/autocheckers.yml b/.github/workflows/autocheckers.yml index 3233a48e9e7..1d01051793b 100644 --- a/.github/workflows/autocheckers.yml +++ b/.github/workflows/autocheckers.yml @@ -45,7 +45,7 @@ jobs: strategy: matrix: - php-versions: ['8.3'] + php-versions: ['8.1'] name: PHP checkers diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 657b17abf73..0ca6ae2bd72 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -29,6 +29,8 @@ jobs: npmVersion: ${{ steps.versions.outputs.npmVersion }} env: + # We'll install cypress in the cypress job + CYPRESS_INSTALL_BINARY: 0 PUPPETEER_SKIP_DOWNLOAD: true steps: @@ -115,9 +117,14 @@ jobs: - name: Set up npm ${{ needs.init.outputs.npmVersion }} run: npm i -g 'npm@${{ needs.init.outputs.npmVersion }}' + - name: Install cypress + run: ./node_modules/cypress/bin/cypress install + - name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests uses: cypress-io/github-action@df7484c5ba85def7eef30db301afa688187bc378 # v6.7.2 with: + # We already installed the dependencies in the init job + install: false component: ${{ matrix.containers == 'component' }} group: ${{ matrix.use-cypress-cloud && matrix.containers == 'component' && 'Run component' || matrix.use-cypress-cloud && 'Run E2E' || '' }} # cypress env diff --git a/.github/workflows/integration-dav.yml b/.github/workflows/integration-dav.yml index b81be2519b8..ce493ae42b1 100644 --- a/.github/workflows/integration-dav.yml +++ b/.github/workflows/integration-dav.yml @@ -43,7 +43,7 @@ jobs: # do not stop on another job's failure fail-fast: false matrix: - php-versions: ['8.3'] + php-versions: ['8.1'] endpoint: ['old', 'new'] service: ['CalDAV', 'CardDAV'] diff --git a/.github/workflows/integration-litmus.yml b/.github/workflows/integration-litmus.yml index f18537d082c..5419db900ca 100644 --- a/.github/workflows/integration-litmus.yml +++ b/.github/workflows/integration-litmus.yml @@ -43,7 +43,7 @@ jobs: # do not stop on another job's failure fail-fast: false matrix: - php-versions: ['8.3'] + php-versions: ['8.1'] endpoint: ['webdav', 'dav'] name: Litmus WebDAV ${{ matrix.endpoint }} diff --git a/.github/workflows/integration-sqlite.yml b/.github/workflows/integration-sqlite.yml index 02666582369..64150025f8b 100644 --- a/.github/workflows/integration-sqlite.yml +++ b/.github/workflows/integration-sqlite.yml @@ -41,6 +41,7 @@ jobs: - '.php-cs-fixer.dist.php' - 'composer.json' - 'composer.lock' + - 'core/shipped.json' integration-sqlite: runs-on: ubuntu-latest @@ -69,7 +70,7 @@ jobs: - 'sharing_features' - 'videoverification_features' - php-versions: ['8.2'] + php-versions: ['8.1'] spreed-versions: ['main'] services: diff --git a/.github/workflows/object-storage-azure.yml b/.github/workflows/object-storage-azure.yml index bb1dc52a9ad..3dd34f84e5b 100644 --- a/.github/workflows/object-storage-azure.yml +++ b/.github/workflows/object-storage-azure.yml @@ -45,7 +45,7 @@ jobs: strategy: matrix: - php-versions: ['8.1', '8.2', '8.3'] + php-versions: ['8.1', '8.2'] include: - php-versions: '8.3' coverage: true diff --git a/.github/workflows/object-storage-s3.yml b/.github/workflows/object-storage-s3.yml index b256174c061..39864367321 100644 --- a/.github/workflows/object-storage-s3.yml +++ b/.github/workflows/object-storage-s3.yml @@ -45,7 +45,7 @@ jobs: strategy: matrix: - php-versions: ['8.1', '8.2', '8.3'] + php-versions: ['8.1', '8.2'] include: - php-versions: '8.3' coverage: true diff --git a/.github/workflows/object-storage-swift.yml b/.github/workflows/object-storage-swift.yml index 9f7bc8c2806..401a7f5af53 100644 --- a/.github/workflows/object-storage-swift.yml +++ b/.github/workflows/object-storage-swift.yml @@ -45,7 +45,7 @@ jobs: strategy: matrix: - php-versions: ['8.1', '8.2', '8.3'] + php-versions: ['8.1', '8.2'] include: - php-versions: '8.3' coverage: true diff --git a/.github/workflows/openapi.yml b/.github/workflows/openapi.yml index f03ecec16c5..282684aef89 100644 --- a/.github/workflows/openapi.yml +++ b/.github/workflows/openapi.yml @@ -31,7 +31,7 @@ jobs: - name: Set up php uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 #v2.31.1 with: - php-version: '8.2' + php-version: '8.1' extensions: ctype, curl, dom, fileinfo, gd, json, libxml, mbstring, openssl, pcntl, pdo, posix, session, simplexml, xml, xmlreader, xmlwriter, zip, zlib coverage: none ini-file: development diff --git a/.github/workflows/phpunit-memcached.yml b/.github/workflows/phpunit-memcached.yml index 51987dda27f..69b5dd7d8f0 100644 --- a/.github/workflows/phpunit-memcached.yml +++ b/.github/workflows/phpunit-memcached.yml @@ -55,7 +55,7 @@ jobs: strategy: matrix: - php-versions: ['8.1', '8.2', '8.3'] + php-versions: ['8.1', '8.3'] include: - php-versions: '8.2' coverage: ${{ github.event_name != 'pull_request' }} diff --git a/.github/workflows/phpunit-mysql-sharding.yml b/.github/workflows/phpunit-mysql-sharding.yml new file mode 100644 index 00000000000..40727b385c4 --- /dev/null +++ b/.github/workflows/phpunit-mysql-sharding.yml @@ -0,0 +1,184 @@ +# This workflow is provided via the organization template repository +# +# https://github.com/nextcloud/.github +# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization +# +# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: MIT + +name: PHPUnit sharding + +on: + pull_request: + schedule: + - cron: "5 2 * * *" + +permissions: + contents: read + +concurrency: + group: phpunit-mysql-sharding-${{ 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/**' + - '**/appinfo/**' + - '**/lib/**' + - '**/templates/**' + - '**/tests/**' + - 'vendor/**' + - 'vendor-bin/**' + - '.php-cs-fixer.dist.php' + - 'composer.json' + - 'composer.lock' + - '**.php' + + phpunit-mysql: + runs-on: ubuntu-latest + + needs: changes + if: needs.changes.outputs.src != 'false' + + strategy: + matrix: + php-versions: ['8.1'] + mysql-versions: ['8.4'] + + name: Sharding - MySQL ${{ matrix.mysql-versions }} (PHP ${{ matrix.php-versions }}) - database tests + + services: + cache: + image: ghcr.io/nextcloud/continuous-integration-redis:latest + ports: + - 6379:6379/tcp + options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3 + + mysql: + image: ghcr.io/nextcloud/continuous-integration-mysql-${{ matrix.mysql-versions }}:latest + ports: + - 4444:3306/tcp + env: + MYSQL_ROOT_PASSWORD: rootpassword + MYSQL_USER: oc_autotest + MYSQL_PASSWORD: nextcloud + MYSQL_DATABASE: oc_autotest + options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 10 + shard1: + image: ghcr.io/nextcloud/continuous-integration-mysql-${{ matrix.mysql-versions }}:latest + ports: + - 5001:3306/tcp + env: + MYSQL_ROOT_PASSWORD: rootpassword + MYSQL_USER: oc_autotest + MYSQL_PASSWORD: nextcloud + MYSQL_DATABASE: nextcloud + options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 10 + shard2: + image: ghcr.io/nextcloud/continuous-integration-mysql-${{ matrix.mysql-versions }}:latest + ports: + - 5002:3306/tcp + env: + MYSQL_ROOT_PASSWORD: rootpassword + MYSQL_USER: oc_autotest + MYSQL_PASSWORD: nextcloud + MYSQL_DATABASE: nextcloud + options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 10 + shard3: + image: ghcr.io/nextcloud/continuous-integration-mysql-${{ matrix.mysql-versions }}:latest + ports: + - 5003:3306/tcp + env: + MYSQL_ROOT_PASSWORD: rootpassword + MYSQL_USER: oc_autotest + MYSQL_PASSWORD: nextcloud + MYSQL_DATABASE: nextcloud + options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 10 + shard4: + image: ghcr.io/nextcloud/continuous-integration-mysql-${{ matrix.mysql-versions }}:latest + ports: + - 5004:3306/tcp + env: + MYSQL_ROOT_PASSWORD: rootpassword + MYSQL_USER: oc_autotest + MYSQL_PASSWORD: nextcloud + MYSQL_DATABASE: nextcloud + options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 10 + + steps: + - name: Checkout server + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + with: + submodules: true + + - name: Set up php ${{ matrix.php-versions }} + uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b #v2.31.0 + 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, mysql, pdo_mysql + coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + ini-file: development + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Set up dependencies + run: composer i + + - 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: Set up Nextcloud + env: + DB_PORT: 4444 + SHARDING: 1 + run: | + mkdir data + cp tests/redis.config.php config/ + cp tests/preseed-config.php config/config.php + ./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 admin + php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0 + + - name: PHPUnit + run: composer run test:db ${{ matrix.coverage && ' -- --coverage-clover ./clover.db.xml' || '' }} + + - name: Upload db code coverage + if: ${{ !cancelled() && matrix.coverage }} + uses: codecov/codecov-action@v4.1.1 + with: + files: ./clover.db.xml + flags: phpunit-mysql + + - name: Print logs + if: always() + run: | + cat data/nextcloud.log + + summary: + permissions: + contents: none + runs-on: ubuntu-latest-low + needs: [changes, phpunit-mysql] + + if: always() + + name: phpunit-mysql-summary + + steps: + - name: Summary status + run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-mysql.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/phpunit-nodb.yml b/.github/workflows/phpunit-nodb.yml index 8eed603277c..4e8529e35a6 100644 --- a/.github/workflows/phpunit-nodb.yml +++ b/.github/workflows/phpunit-nodb.yml @@ -57,7 +57,7 @@ jobs: strategy: matrix: - php-versions: ['8.1', '8.2', '8.3'] + php-versions: ['8.1', '8.3'] include: - php-versions: '8.2' coverage: ${{ github.event_name != 'pull_request' }} diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index 12a65fb852b..582f3bc5b85 100644 --- a/.github/workflows/phpunit-sqlite.yml +++ b/.github/workflows/phpunit-sqlite.yml @@ -55,7 +55,7 @@ jobs: strategy: matrix: - php-versions: ['8.1', '8.2', '8.3'] + php-versions: ['8.2', '8.3'] include: - php-versions: '8.1' coverage: ${{ github.event_name != 'pull_request' }} |