diff --git a/.drone.env b/.drone.env index d55b676dba6..2abf91ec78b 100644 --- a/.drone.env +++ b/.drone.env @@ -1,3 +1,3 @@ # The test runner source for UI tests -WEB_COMMITID=5fec611688782cdf97fafa31993fe40018f6c132 -WEB_BRANCH=release-7.1.1 +WEB_COMMITID=0fa16b309ec9954cbd2c12d5b58831e9848e4efa +WEB_BRANCH=release-7.1.2 diff --git a/.drone.star b/.drone.star index a207501c9e3..f4b49c2ffdb 100644 --- a/.drone.star +++ b/.drone.star @@ -2614,6 +2614,7 @@ def generateWebPnpmCache(ctx): "image": OC_CI_NODEJS % DEFAULT_NODEJS_VERSION, "commands": [ "cd %s" % dirs["web"], + 'npm install --silent --global --force "$(jq -r ".packageManager" < package.json)"', "pnpm config set store-dir ./.pnpm-store", "retry -t 3 'pnpm install'", ], @@ -2705,6 +2706,7 @@ def restoreWebPnpmCache(): "cd %s" % dirs["web"], "rm -rf .pnpm-store", "tar -xvf %s" % dirs["webPnpmZip"], + 'npm install --silent --global --force "$(jq -r ".packageManager" < package.json)"', "pnpm config set store-dir ./.pnpm-store", "retry -t 3 'pnpm install'", ], diff --git a/changelog/unreleased/bump-web-7.1.1.md b/changelog/unreleased/bump-web-7.1.1.md deleted file mode 100644 index 80e5d3b0daa..00000000000 --- a/changelog/unreleased/bump-web-7.1.1.md +++ /dev/null @@ -1,11 +0,0 @@ -Enhancement: Update web to v7.1.1 - -Tags: web - -We updated ownCloud Web to v7.1.1. Please refer to the changelog (linked) for details on the web release. - -## Summary -* Bugfix [owncloud/web#9833](https://github.com/owncloud/web/pull/9833): Resolving external URLs - -https://github.com/owncloud/ocis/pull/7601 -https://github.com/owncloud/web/releases/tag/v7.1.1 \ No newline at end of file diff --git a/changelog/unreleased/bump-web-7.1.2.md b/changelog/unreleased/bump-web-7.1.2.md new file mode 100644 index 00000000000..3a7a3c8d1de --- /dev/null +++ b/changelog/unreleased/bump-web-7.1.2.md @@ -0,0 +1,13 @@ +Enhancement: Update web to v7.1.2 + +Tags: web + +We updated ownCloud Web to v7.1.2. Please refer to the changelog (linked) for details on the web release. + +## Summary +* Bugfix [owncloud/web#9833](https://github.com/owncloud/web/pull/9833): Resolving external URLs +* Bugfix [owncloud/web#9868](https://github.com/owncloud/web/pull/9868): Respect "details"-query on private links +* Bugfix [owncloud/web#9913](https://github.com/owncloud/web/pull/9913): Private link resolving via share jail ID + +https://github.com/owncloud/ocis/pull/7798 +https://github.com/owncloud/web/releases/tag/v7.1.2 diff --git a/services/web/Makefile b/services/web/Makefile index af83767174b..94c69980eee 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -1,6 +1,6 @@ SHELL := bash NAME := web -WEB_ASSETS_VERSION = v7.1.1 +WEB_ASSETS_VERSION = v7.1.2 include ../../.make/recursion.mk