From b06ba8ff4c1080f9ac88ec2a3ef10bf7a75cfd9d Mon Sep 17 00:00:00 2001 From: nextcloud-command Date: Sun, 23 Jul 2023 02:46:53 +0000 Subject: [PATCH 1/2] chore(dev-deps): Bump nextcloud/ocp package Signed-off-by: GitHub --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index b0207aec..4664af72 100644 --- a/composer.lock +++ b/composer.lock @@ -1067,12 +1067,12 @@ "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "e83c3af4c37a8be5d7c6a6339f4aa2c99cc74f97" + "reference": "6f0ffec5ace13e71f50d0735c0258fc37f4ca562" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/e83c3af4c37a8be5d7c6a6339f4aa2c99cc74f97", - "reference": "e83c3af4c37a8be5d7c6a6339f4aa2c99cc74f97", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/6f0ffec5ace13e71f50d0735c0258fc37f4ca562", + "reference": "6f0ffec5ace13e71f50d0735c0258fc37f4ca562", "shasum": "" }, "require": { @@ -1102,7 +1102,7 @@ "issues": "https://github.com/nextcloud-deps/ocp/issues", "source": "https://github.com/nextcloud-deps/ocp/tree/stable26" }, - "time": "2023-07-06T00:47:48+00:00" + "time": "2023-07-17T09:26:46+00:00" }, { "name": "nikic/php-parser", From f2219e46da0771fa688671b7fcad6cd8efdc221e Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Fri, 28 Jul 2023 11:05:42 -0100 Subject: [PATCH 2/2] fix tests Signed-off-by: Maxence Lange --- .github/workflows/lint-info-xml.yml | 40 ---------------------------- .github/workflows/phpunit-sqlite.yml | 2 +- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 .github/workflows/lint-info-xml.yml diff --git a/.github/workflows/lint-info-xml.yml b/.github/workflows/lint-info-xml.yml deleted file mode 100644 index 9f8d0b6a..00000000 --- a/.github/workflows/lint-info-xml.yml +++ /dev/null @@ -1,40 +0,0 @@ -# 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 - -name: Lint - -on: - pull_request: - push: - branches: - - main - - master - - stable* - -permissions: - contents: read - -concurrency: - group: lint-info-xml-${{ github.head_ref || github.run_id }} - cancel-in-progress: true - -jobs: - xml-linters: - runs-on: ubuntu-latest - - name: info.xml lint - steps: - - name: Checkout - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3 - - - name: Download schema - run: wget https://raw.githubusercontent.com/nextcloud/server/master/resources/app-info-shipped.xsd - - - name: Lint info.xml - uses: ChristophWurst/xmllint-action@d18a551aab4728e4af449617638600634d7a48cb # v1 - with: - xml-file: ./appinfo/info.xml - xml-schema-file: ./app-info-shipped.xsd - diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index 1c67bbe0..1ead26c9 100644 --- a/.github/workflows/phpunit-sqlite.yml +++ b/.github/workflows/phpunit-sqlite.yml @@ -63,7 +63,7 @@ jobs: uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2 with: php-version: ${{ matrix.php-versions }} - extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite + extensions: ctype, curl, dom, fileinfo, gd, intl, json, mbstring, openssl, pdo_sqlite, posix, xml, zip, sqlite, pdo_sqlite coverage: none env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}