From 7395048ab1efd7a9a3ea067e609a8861e72c8750 Mon Sep 17 00:00:00 2001 From: pwengerter <pascal@wengerter.info> Date: Tue, 26 Oct 2021 15:59:25 +0100 Subject: [PATCH] Update web to v4.4.0 --- .drone.env | 2 +- changelog/unreleased/update-web-4.4.0.md | 8 ++++++++ docs/extensions/accounts/releasing.md | 8 ++------ docs/extensions/settings/releasing.md | 7 ++----- docs/extensions/web/releasing.md | 10 ++++------ web/Makefile | 2 +- 6 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 changelog/unreleased/update-web-4.4.0.md diff --git a/.drone.env b/.drone.env index 0f31d8d8138..4b9fa3c9040 100644 --- a/.drone.env +++ b/.drone.env @@ -3,5 +3,5 @@ CORE_COMMITID=2883a0165324fcc853ea5d7090229317c282892a CORE_BRANCH=master # The test runner source for UI tests -WEB_COMMITID=6dae5d82e4c6b3310301005ad6e38c0493b854fa +WEB_COMMITID=6a40bf43dd0d6170672ac754e948ba51692c357c WEB_BRANCH=master diff --git a/changelog/unreleased/update-web-4.4.0.md b/changelog/unreleased/update-web-4.4.0.md new file mode 100644 index 00000000000..8712a35222d --- /dev/null +++ b/changelog/unreleased/update-web-4.4.0.md @@ -0,0 +1,8 @@ +Change: Update ownCloud Web to v4.4.0 + +Tags: web + +We updated ownCloud Web to v4.4.0. Please refer to the changelog (linked) for details on the web release. + +https://github.com/owncloud/ocis/pull/2681 +https://github.com/owncloud/web/releases/tag/v4.4.0 diff --git a/docs/extensions/accounts/releasing.md b/docs/extensions/accounts/releasing.md index 374d77e6cb1..23994127eca 100644 --- a/docs/extensions/accounts/releasing.md +++ b/docs/extensions/accounts/releasing.md @@ -10,14 +10,10 @@ geekdocFilePath: releasing.md ## Requirements -You need a working installation of [the Go programming language](https://golang.org/) installed to build the assets for a working release. - +You need a working installation of [the Go programming language](https://golang.org/), [the Node runtime](https://nodejs.org/) and [the Yarn package manager](https://yarnpkg.com/) installed to build the assets for a working release. ## Releasing -After adding changes to the accounts package within oCIS and testing them locally, you want to update the compiled assets to the oCIS binary. - -To achieve this, you have to run a Go command and add the results to your PR. The preferred way to do this is to run `make generate` in the root -of the repository and then commit the resulting changes to your branch/PR. +The accounts service doesn't have a dedicated release process. Simply commit your changes, make sure linting and unit tests pass locally and open a pull request. ### Package Hierarchy diff --git a/docs/extensions/settings/releasing.md b/docs/extensions/settings/releasing.md index 556ce9c2bfc..f67e27a3eb4 100644 --- a/docs/extensions/settings/releasing.md +++ b/docs/extensions/settings/releasing.md @@ -10,14 +10,11 @@ geekdocFilePath: releasing.md ## Requirements -You need a working installation of [the Go programming language](https://golang.org/) installed to build the assets for a working release. +You need a working installation of [the Go programming language](https://golang.org/), [the Node runtime](https://nodejs.org/) and [the Yarn package manager](https://yarnpkg.com/) installed to build the assets for a working release. ## Releasing -After adding changes to the settings package within oCIS and testing them locally, you want to update the compiled assets to the oCIS binary. - -To achieve this, you have to run a Go command and add the results to your PR. The preferred way to do this is to run `make generate` in the root -of the repository and then commit the resulting changes to your branch/PR. +The settings service doesn't have a dedicated release process. Simply commit your changes, make sure linting and unit tests pass locally and open a pull request. ### Package Hierarchy diff --git a/docs/extensions/web/releasing.md b/docs/extensions/web/releasing.md index 22a7a489b34..75f2130ccdc 100644 --- a/docs/extensions/web/releasing.md +++ b/docs/extensions/web/releasing.md @@ -31,9 +31,7 @@ and take note of its release tag name. 1. Create a branch `update-web-$version` in the [ocis repository](https://github.com/owncloud/ocis) 2. Change into web package folder via `cd web` 3. Inside `web/`, update the `Makefile` so that the WEB_ASSETS_VERSION variable references the currently released version of https://github.com/owncloud/web -4. Inside `web/`, replace the current assets with newly released ones by running `make pull-assets` -5. Inside `web/`, run `make generate`. The output should look something like this: `web: embed.go - YYY/MM/DD ... to write [./embed.go] from config file ...` -6. Move to the changelog (`cd ../changelog/`) and add a changelog file to the `unreleased/` folder (You can copy an old web release changelog item as a template) -7. Move to the repo root (`cd ..`)and update the WEB_COMMITID in the `/.drone.env` file to the commit id from the released version (unless the existing commit id is already newer) -8. **Optional:** Test the changes locally by running `cd ocis && go run cmd/ocis/main.go server`, visiting [https://localhost:9200](https://localhost:9200) and confirming everything renders correctly -9. Commit your changes, push them and [create a PR](https://github.com/owncloud/ocis/pulls) +4. Move to the changelog (`cd ../changelog/`) and add a changelog file to the `unreleased/` folder (You can copy an old web release changelog item as a template) +5. Move to the repo root (`cd ..`)and update the WEB_COMMITID in the `/.drone.env` file to the commit id from the released version (unless the existing commit id is already newer) +6. **Optional:** Test the changes locally by running `cd ocis && go run cmd/ocis/main.go server`, visiting [https://localhost:9200](https://localhost:9200) and confirming everything renders correctly +7. Commit your changes, push them and [create a PR](https://github.com/owncloud/ocis/pulls) diff --git a/web/Makefile b/web/Makefile index 7e26364de98..5b0114aa918 100644 --- a/web/Makefile +++ b/web/Makefile @@ -27,7 +27,7 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target .PHONY: ci-node-generate ci-node-generate: pull-assets -WEB_ASSETS_VERSION = v4.3.0 +WEB_ASSETS_VERSION = v4.4.0 .PHONY: pull-assets pull-assets: