From 960cebb4f32dab61ad37efea6cd6d5f0862d03ec Mon Sep 17 00:00:00 2001 From: nextcloud-command Date: Sun, 22 Jun 2025 03:38:54 +0000 Subject: [PATCH 1/3] chore(dev-deps): Bump nextcloud/ocp package Signed-off-by: GitHub --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index df6e24549bf..187c3c048e9 100644 --- a/composer.lock +++ b/composer.lock @@ -240,12 +240,12 @@ "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "97d7aa6e535670437a178084eea91a42998fef5c" + "reference": "b67645781728716a3ee4c32b2636b1dc4b30d894" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/97d7aa6e535670437a178084eea91a42998fef5c", - "reference": "97d7aa6e535670437a178084eea91a42998fef5c", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/b67645781728716a3ee4c32b2636b1dc4b30d894", + "reference": "b67645781728716a3ee4c32b2636b1dc4b30d894", "shasum": "" }, "require": { @@ -281,7 +281,7 @@ "issues": "https://github.com/nextcloud-deps/ocp/issues", "source": "https://github.com/nextcloud-deps/ocp/tree/master" }, - "time": "2025-06-13T00:53:13+00:00" + "time": "2025-06-19T00:53:32+00:00" }, { "name": "nikic/php-parser", @@ -3000,8 +3000,8 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "roave/security-advisories": 20, - "nextcloud/ocp": 20 + "nextcloud/ocp": 20, + "roave/security-advisories": 20 }, "prefer-stable": false, "prefer-lowest": false, @@ -3014,5 +3014,5 @@ "platform-overrides": { "php": "8.1" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From 9ed07f75032e0f9310038a0671a5081ea63abf15 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 22 Jun 2025 08:57:47 +0200 Subject: [PATCH 2/3] chore(workflows): update npm-audit-fix Signed-off-by: Max --- .github/workflows/npm-audit-fix.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml index 7e7fe1dabc6..2f804dc1846 100644 --- a/.github/workflows/npm-audit-fix.yml +++ b/.github/workflows/npm-audit-fix.yml @@ -24,7 +24,10 @@ jobs: strategy: fail-fast: false matrix: - branches: ['main', 'master', 'stable31', 'stable30'] + branches: + - ${{ github.event.repository.default_branch }} + - 'stable31' + - 'stable30' name: npm-audit-fix-${{ matrix.branches }} From c253378969e08dc10727653547ed91f590fad507 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 22 Jun 2025 08:59:21 +0200 Subject: [PATCH 3/3] chore(workflows): no build in npm-audit-fix We build on the integration branch - not in PRs I wonder if we should rename our `build` script entry in package.json instead as that would allow using the original workflow. Signed-off-by: Max --- .github/workflows/npm-audit-fix.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml index 2f804dc1846..1b2d06ae9e0 100644 --- a/.github/workflows/npm-audit-fix.yml +++ b/.github/workflows/npm-audit-fix.yml @@ -59,13 +59,12 @@ jobs: id: npm-audit uses: nextcloud-libraries/npm-audit-action@1b1728b2b4a7a78d69de65608efcf4db0e3e42d0 # v0.2.0 - - name: Run npm ci and npm run build + - name: Run npm ci if: steps.checkout.outcome == 'success' env: CYPRESS_INSTALL_BINARY: 0 run: | npm ci - npm run build --if-present - name: Create Pull Request if: steps.checkout.outcome == 'success'