Skip to content

Commit

Permalink
Update web to v4.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalwengerter committed Oct 26, 2021
1 parent c1bce46 commit 7395048
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .drone.env
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 8 additions & 0 deletions changelog/unreleased/update-web-4.4.0.md
Original file line number Diff line number Diff line change
@@ -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
8 changes: 2 additions & 6 deletions docs/extensions/accounts/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 2 additions & 5 deletions docs/extensions/settings/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 4 additions & 6 deletions docs/extensions/web/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion web/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 7395048

Please sign in to comment.