diff --git a/.github/dependabot.yml b/.github/dependabot.yml index cd447797be3..67109e0fc6a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -61,3 +61,9 @@ updates: - dependency-name: sinon versions: - 9.2.4 + +- package-ecosystem: "github-actions" + directory: "/" # Location of package manifests + schedule: + interval: "weekly" + diff --git a/.github/workflows/lint-and-codestyle.yml b/.github/workflows/lint-and-codestyle.yml index 5c8161b7578..41e804cb924 100644 --- a/.github/workflows/lint-and-codestyle.yml +++ b/.github/workflows/lint-and-codestyle.yml @@ -27,10 +27,10 @@ jobs: php-version: ["7.4"] steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - name: Setup PHP - uses: shivammathur/setup-php@v2 + uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0 with: php-version: ${{ matrix.php-version }} extensions: curl, gd, json, xml, zip diff --git a/.github/workflows/php-unit.yml b/.github/workflows/php-unit.yml new file mode 100644 index 00000000000..f730d18a4ef --- /dev/null +++ b/.github/workflows/php-unit.yml @@ -0,0 +1,122 @@ +on: + workflow_call: + inputs: + php-versions: + description: JSON array of PHP versions + required: true + type: string + +permissions: + contents: read + +jobs: + php-unit: + name: PHP Unit + runs-on: ubuntu-latest + strategy: + fail-fast: true + matrix: + php: ${{ fromJSON(inputs.php-versions) }} + database: [sqlite] + include: + - php: "8.3" + database: "mysql:8.0" + - php: "8.3" + database: "mariadb:10.6" + - php: "8.3" + database: "mariadb:10.11" + - php: "8.3" + database: "postgres:10.21" + + services: + mysql: + image: >- + ${{ (startsWith(matrix.database,'mysql:') || startsWith(matrix.database,'mariadb:')) && matrix.database || '' }} + env: + MYSQL_ROOT_PASSWORD: password + MYSQL_DATABASE: owncloud + MYSQL_USER: owncloud + MYSQL_PASSWORD: owncloud + options: >- + --health-cmd="mysqladmin ping -u root -ppassword" + --health-interval=10s + --health-timeout=5s + --health-retries=3 + ports: + - 3306:3306 + postgres: + image: ${{ startsWith(matrix.database,'postgres:') && matrix.database || '' }} + env: + POSTGRES_DB: owncloud + POSTGRES_USER: owncloud + POSTGRES_PASSWORD: owncloud + ports: + - 5432:5432 + + steps: + - name: Clone owncloud/core + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + with: + repository: owncloud/core + + - name: Setup PHP + uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0 + with: + php-version: ${{ matrix.php }} + extensions: curl, gd, json, xml, zip, imagick + ini-values: "memory_limit=2048M" + + - name: Install ffmpeg & imagemagick + run: | + sudo apt-get update + sudo apt-get install -y ffmpeg imagemagick + + - name: Install Composer dependencies + run: | + make install-composer-deps + + - name: Install Server + env: + DATA_DIRECTORY: ${{ github.workspace }}/data + DB: ${{ matrix.database }} + DB_NAME: owncloud + ADMIN_LOGIN: admin + ADMIN_PASSWORD: admin + DB_HOST: 127.0.0.1 + DB_USERNAME: owncloud + DB_PASSWORD: owncloud + + run: | + DB_TYPE=${DB%:*} + if [ $DB_TYPE == "postgres" ] ; then DB_TYPE="pgsql"; fi + if [ $DB_TYPE == "mariadb" ] ; then DB_TYPE="mysql"; fi + install_cmd="maintenance:install -vvv \ + --database=${DB_TYPE} \ + --database-name=${DB_NAME} \ + --admin-user=${ADMIN_LOGIN} \ + --admin-pass=${ADMIN_PASSWORD} \ + --data-dir=${DATA_DIRECTORY} " + + if [[ "${DB_TYPE}" != "sqlite" ]]; then + install_cmd+=" --database-host=${DB_HOST} \ + --database-user=${DB_USERNAME} \ + --database-pass=${DB_PASSWORD}" + fi + + php occ ${install_cmd} + echo "enabling apps" + php occ app:enable files_sharing + php occ app:enable files_trashbin + php occ app:enable files_versions + php occ app:enable provisioning_api + php occ app:enable federation + php occ app:enable federatedfilesharing + + - name: Run PHPUnit + run: | + bash tests/drone/test-phpunit.sh + + - name: Tail logs + if: failure() + run: | + cat data/owncloud.log diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index bb1ec9c066c..f056211fd76 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -15,7 +15,7 @@ jobs: permissions: issues: write steps: - - uses: actions/stale@v4 + - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0 with: days-before-issue-stale: 180 days-before-issue-close: 10 diff --git a/CHANGELOG.md b/CHANGELOG.md index 85e8c8a6733..fe0f1a35439 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Table of Contents +* [Changelog for 10.16.2](#changelog-for-owncloud-core-10162-2026-04-02) * [Changelog for 10.16.1](#changelog-for-owncloud-core-10161-2026-02-18) * [Changelog for 10.16.0](#changelog-for-owncloud-core-10160-2025-10-23) * [Changelog for 10.15.3](#changelog-for-owncloud-core-10153-2025-07-04) @@ -26,6 +27,27 @@ * [Changelog for 10.4.1](#changelog-for-owncloud-core-1041-2020-03-30) * [Changelog for 10.4.0](#changelog-for-owncloud-core-1040-2020-02-10) * [Changelog for 10.3.2](#changelog-for-owncloud-core-1032-2019-12-04) +# Changelog for ownCloud Core [10.16.2] (2026-04-02) + +The following sections list the changes in ownCloud core 10.16.2 relevant to +ownCloud admins and users. + +[10.16.2]: https://github.com/owncloud/core/compare/v10.16.1...v10.16.2 + +## Summary + +* Change - Update dependencies: [#41518](https://github.com/owncloud/core/pull/41518) + +## Details + +* Change - Update dependencies: [#41518](https://github.com/owncloud/core/pull/41518) + + The following have been updated: - phpseclib/phpseclib (3.0.49 to 3.0.50) - + minimatch (3.1.2 to 3.1.5) - underscore.js (1.13.6 to 1.13.8) - brace-expansion + (1.1.12 to 1.1.13) + + https://github.com/owncloud/core/pull/41518 + # Changelog for ownCloud Core [10.16.1] (2026-02-18) The following sections list the changes in ownCloud core 10.16.1 relevant to diff --git a/build/yarn.lock b/build/yarn.lock index 57390051285..389828db963 100644 --- a/build/yarn.lock +++ b/build/yarn.lock @@ -463,9 +463,9 @@ body-parser@^1.19.0: unpipe "1.0.0" brace-expansion@^1.1.7: - version "1.1.12" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843" - integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg== + version "1.1.13" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.13.tgz#d37875c01dc9eff988dd49d112a57cb67b54efe6" + integrity sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w== dependencies: balanced-match "^1.0.0" concat-map "0.0.1" @@ -1203,9 +1203,9 @@ mimic-fn@^1.0.0: integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== minimatch@^3.0.4, minimatch@^3.1.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + version "3.1.5" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.5.tgz#580c88f8d5445f2bd6aa8f3cadefa0de79fbd69e" + integrity sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w== dependencies: brace-expansion "^1.1.7" @@ -1621,9 +1621,9 @@ uglify-js@^3.1.4: integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== underscore@>=1.8.3: - version "1.13.6" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441" - integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A== + version "1.13.8" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.8.tgz#a93a21186c049dbf0e847496dba72b7bd8c1e92b" + integrity sha512-DXtD3ZtEQzc7M8m4cXotyHR+FAS18C64asBYY5vqZexfYryNNnDc02W4hKg3rdQuqOYas1jkseX0+nZXjTXnvQ== undici-types@~5.26.4: version "5.26.5" diff --git a/changelog/10.16.2_2026-04-02/41518 b/changelog/10.16.2_2026-04-02/41518 new file mode 100644 index 00000000000..46a51a812de --- /dev/null +++ b/changelog/10.16.2_2026-04-02/41518 @@ -0,0 +1,9 @@ +Change: Update dependencies + +The following have been updated: +- phpseclib/phpseclib (3.0.49 to 3.0.50) +- minimatch (3.1.2 to 3.1.5) +- underscore.js (1.13.6 to 1.13.8) +- brace-expansion (1.1.12 to 1.1.13) + +https://github.com/owncloud/core/pull/41518 \ No newline at end of file diff --git a/composer.lock b/composer.lock index 5562e830818..955230da95b 100644 --- a/composer.lock +++ b/composer.lock @@ -2630,16 +2630,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "3.0.49", + "version": "3.0.50", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "6233a1e12584754e6b5daa69fe1289b47775c1b9" + "reference": "aa6ad8321ed103dc3624fb600a25b66ebf78ec7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/6233a1e12584754e6b5daa69fe1289b47775c1b9", - "reference": "6233a1e12584754e6b5daa69fe1289b47775c1b9", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/aa6ad8321ed103dc3624fb600a25b66ebf78ec7b", + "reference": "aa6ad8321ed103dc3624fb600a25b66ebf78ec7b", "shasum": "" }, "require": { @@ -2720,7 +2720,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/3.0.49" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.50" }, "funding": [ { @@ -2736,7 +2736,7 @@ "type": "tidelift" } ], - "time": "2026-01-27T09:17:28+00:00" + "time": "2026-03-19T02:57:58+00:00" }, { "name": "pimple/pimple", @@ -7655,7 +7655,7 @@ "ext-simplexml": "*", "ext-zip": "*" }, - "platform-dev": {}, + "platform-dev": [], "platform-overrides": { "php": "7.4" }, diff --git a/version.php b/version.php index d75eb9abd04..bb942d356f7 100644 --- a/version.php +++ b/version.php @@ -25,10 +25,10 @@ // We only can count up. The 4. digit is only for the internal patch-level to trigger DB upgrades // between betas, final and RCs. This is _not_ the public version number. Reset minor/patch-level // when updating major/minor version number. -$OC_Version = [10, 16, 1, 0]; +$OC_Version = [10, 16, 2, 0]; // The human-readable string -$OC_VersionString = '10.16.1'; +$OC_VersionString = '10.16.2'; $OC_VersionCanBeUpgradedFrom = [[8, 2, 11],[9, 0, 9],[9, 1]];