From 8dfbe316ebfa80da457025dcc0bbfca4ca4a1cd1 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 23 Jan 2025 10:45:59 +0100 Subject: [PATCH 1/3] feat(deps): Add Nextcloud 32 support on master Signed-off-by: Joas Schilling --- .github/dependabot.yml | 16 ++++++++++++++++ .github/workflows/npm-audit-fix.yml | 2 +- .github/workflows/update-nextcloud-ocp.yml | 2 +- appinfo/info.xml | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- 6 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b907fb5eb..c7f4f1454 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -37,6 +37,22 @@ updates: - "dependencies" # Main stableXX npm + - package-ecosystem: npm + directory: "/" + schedule: + interval: weekly + day: saturday + time: "03:00" + timezone: Europe/Paris + target-branch: stable31 + labels: + - "3. to review" + - "dependencies" + ignore: + # ignore all GitHub linguist patch updates + - dependency-name: "*" + update-types: ["version-update:semver-major", "version-update:semver-minor"] + - package-ecosystem: npm directory: "/" schedule: diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml index 5ccc57df6..c3e4f2fd3 100644 --- a/.github/workflows/npm-audit-fix.yml +++ b/.github/workflows/npm-audit-fix.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ['main', 'master', 'stable30', 'stable29', 'stable28'] + branches: ['main', 'master', 'stable31', 'stable30', 'stable29'] name: npm-audit-fix-${{ matrix.branches }} diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml index bbeec0c6e..69498cc33 100644 --- a/.github/workflows/update-nextcloud-ocp.yml +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ['main', 'master', 'stable30', 'stable29', 'stable28'] + branches: ['main', 'master', 'stable31', 'stable30', 'stable29'] name: update-nextcloud-ocp-${{ matrix.branches }} diff --git a/appinfo/info.xml b/appinfo/info.xml index 9df983877..b101b5c05 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -13,7 +13,7 @@ The First run wizard can be customized to meet specific design goals, or to change links and messages. Create an appropriate theme following the Theming documentation, and changes to the look and feel of this Wizard are simple. More information is available in the first run wizard documentation, as well as the theming documentation. - 4.0.0 + 5.0.0-dev.0 agpl Frank Karlitschek Jan-Christoph Borchardt @@ -27,7 +27,7 @@ The First run wizard can be customized to meet specific design goals, or to chan https://github.com/nextcloud/firstrunwizard.git - + diff --git a/package-lock.json b/package-lock.json index 5eb424cfa..504dc8bd6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "firstrunwizard", - "version": "4.0.0", + "version": "5.0.0-dev.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "firstrunwizard", - "version": "4.0.0", + "version": "5.0.0-dev.0", "license": "AGPL-3.0-or-later", "dependencies": { "@mdi/js": "^7.4.47", diff --git a/package.json b/package.json index dd3dd0fbd..c2a8d17f4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "firstrunwizard", "description": "A first run wizard that explains the usage of Nextcloud to new users", - "version": "4.0.0", + "version": "5.0.0-dev.0", "author": "Julius Härtl ", "license": "AGPL-3.0-or-later", "private": true, From 8ce4778a97ec1abfad033c4879969c6b9383eb7c Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Thu, 23 Jan 2025 11:18:22 +0100 Subject: [PATCH 2/3] chore(dependabot): remove stable28 Signed-off-by: Simon L. --- .github/dependabot.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c7f4f1454..922d9c1bd 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -84,20 +84,3 @@ updates: # ignore all GitHub linguist patch updates - dependency-name: "*" update-types: ["version-update:semver-major", "version-update:semver-minor"] - - - package-ecosystem: npm - directory: "/" - schedule: - interval: weekly - day: saturday - time: "03:00" - timezone: Europe/Paris - target-branch: stable28 - labels: - - "3. to review" - - "dependencies" - ignore: - # ignore all GitHub linguist patch updates - - dependency-name: "*" - update-types: ["version-update:semver-major", "version-update:semver-minor"] - From 814ba5d36e2b07eb47b005094c8761cbb21e198e Mon Sep 17 00:00:00 2001 From: nextcloud-command Date: Thu, 23 Jan 2025 22:47:28 +0000 Subject: [PATCH 3/3] chore(assets): Recompile assets Signed-off-by: nextcloud-command --- js/firstrunwizard-about.mjs.license | 2 +- js/firstrunwizard-about.mjs.map.license | 2 +- js/firstrunwizard-activate.mjs.license | 2 +- js/firstrunwizard-activate.mjs.map.license | 2 +- js/firstrunwizard-settings.mjs.license | 2 +- js/firstrunwizard-settings.mjs.map.license | 2 +- js/main-ClP4y8r7.chunk.mjs.license | 2 +- js/main-ClP4y8r7.chunk.mjs.map.license | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/js/firstrunwizard-about.mjs.license b/js/firstrunwizard-about.mjs.license index b1ea350fe..ec813689b 100644 --- a/js/firstrunwizard-about.mjs.license +++ b/js/firstrunwizard-about.mjs.license @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: Julius Härtl This file is generated from multiple sources. Included packages: - firstrunwizard - - version: 4.0.0 + - version: 5.0.0-dev.0 - license: AGPL-3.0-or-later diff --git a/js/firstrunwizard-about.mjs.map.license b/js/firstrunwizard-about.mjs.map.license index b1ea350fe..ec813689b 100644 --- a/js/firstrunwizard-about.mjs.map.license +++ b/js/firstrunwizard-about.mjs.map.license @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: Julius Härtl This file is generated from multiple sources. Included packages: - firstrunwizard - - version: 4.0.0 + - version: 5.0.0-dev.0 - license: AGPL-3.0-or-later diff --git a/js/firstrunwizard-activate.mjs.license b/js/firstrunwizard-activate.mjs.license index b1ea350fe..ec813689b 100644 --- a/js/firstrunwizard-activate.mjs.license +++ b/js/firstrunwizard-activate.mjs.license @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: Julius Härtl This file is generated from multiple sources. Included packages: - firstrunwizard - - version: 4.0.0 + - version: 5.0.0-dev.0 - license: AGPL-3.0-or-later diff --git a/js/firstrunwizard-activate.mjs.map.license b/js/firstrunwizard-activate.mjs.map.license index b1ea350fe..ec813689b 100644 --- a/js/firstrunwizard-activate.mjs.map.license +++ b/js/firstrunwizard-activate.mjs.map.license @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: Julius Härtl This file is generated from multiple sources. Included packages: - firstrunwizard - - version: 4.0.0 + - version: 5.0.0-dev.0 - license: AGPL-3.0-or-later diff --git a/js/firstrunwizard-settings.mjs.license b/js/firstrunwizard-settings.mjs.license index d69cac78a..7418d42ae 100644 --- a/js/firstrunwizard-settings.mjs.license +++ b/js/firstrunwizard-settings.mjs.license @@ -27,7 +27,7 @@ This file is generated from multiple sources. Included packages: - version: 8.19.0 - license: AGPL-3.0-or-later - firstrunwizard - - version: 4.0.0 + - version: 5.0.0-dev.0 - license: AGPL-3.0-or-later - path-browserify - version: 1.0.1 diff --git a/js/firstrunwizard-settings.mjs.map.license b/js/firstrunwizard-settings.mjs.map.license index d69cac78a..7418d42ae 100644 --- a/js/firstrunwizard-settings.mjs.map.license +++ b/js/firstrunwizard-settings.mjs.map.license @@ -27,7 +27,7 @@ This file is generated from multiple sources. Included packages: - version: 8.19.0 - license: AGPL-3.0-or-later - firstrunwizard - - version: 4.0.0 + - version: 5.0.0-dev.0 - license: AGPL-3.0-or-later - path-browserify - version: 1.0.1 diff --git a/js/main-ClP4y8r7.chunk.mjs.license b/js/main-ClP4y8r7.chunk.mjs.license index 1770025ad..b5a518b12 100644 --- a/js/main-ClP4y8r7.chunk.mjs.license +++ b/js/main-ClP4y8r7.chunk.mjs.license @@ -188,7 +188,7 @@ This file is generated from multiple sources. Included packages: - version: 1.7.4 - license: MIT - firstrunwizard - - version: 4.0.0 + - version: 5.0.0-dev.0 - license: AGPL-3.0-or-later - semver - version: 7.6.3 diff --git a/js/main-ClP4y8r7.chunk.mjs.map.license b/js/main-ClP4y8r7.chunk.mjs.map.license index 1770025ad..b5a518b12 100644 --- a/js/main-ClP4y8r7.chunk.mjs.map.license +++ b/js/main-ClP4y8r7.chunk.mjs.map.license @@ -188,7 +188,7 @@ This file is generated from multiple sources. Included packages: - version: 1.7.4 - license: MIT - firstrunwizard - - version: 4.0.0 + - version: 5.0.0-dev.0 - license: AGPL-3.0-or-later - semver - version: 7.6.3