Skip to content

Commit

Permalink
Merge pull request #935 from owncloud/update-phoenix-0.2.6
Browse files Browse the repository at this point in the history
Update ocis-web to 0.2.6
  • Loading branch information
phil-davis authored Nov 24, 2020
2 parents ee016ad + 559f777 commit 09181cb
Show file tree
Hide file tree
Showing 6 changed files with 338 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ config = {
},
'uiTests': {
'phoenixBranch': 'master',
'phoenixCommit': 'a32cdff6ba76ec3438bd348715aeed0ae593d6ed',
'phoenixCommit': '4395234656fb70c869ee960ca5d7b853ffcc5ef8',
'suites': {
'webUIBasic': [
'webUILogin',
Expand Down
8 changes: 8 additions & 0 deletions changelog/unreleased/update-web-0.26.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Change: Update phoenix to v0.26.0

Tags: web

We updated phoenix to v0.26.0. Please refer to the changelog (linked) for details on the phoenix release.

https://github.com/owncloud/phoenix/releases/tag/v0.26.0
https://github.com/owncloud/ocis/pull/935
2 changes: 1 addition & 1 deletion ocis-phoenix/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ NAME := ocis-phoenix
IMPORT := github.com/owncloud/ocis/$(NAME)
BIN := bin
DIST := dist
PHOENIX_ASSETS_VERSION = v0.25.0
PHOENIX_ASSETS_VERSION = v0.26.0

ifeq ($(OS), Windows_NT)
EXECUTABLE := $(NAME).exe
Expand Down
1 change: 1 addition & 0 deletions ocis-phoenix/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ require (
github.com/micro/cli/v2 v2.1.2
github.com/oklog/run v1.1.0
github.com/openzipkin/zipkin-go v0.2.2
github.com/owncloud/ocis-pkg v1.3.0 // indirect
github.com/owncloud/ocis/ocis-pkg v0.0.0-20200918114005-1a0ddd2190ee
github.com/restic/calens v0.2.0
github.com/spf13/viper v1.7.0
Expand Down
Loading

0 comments on commit 09181cb

Please sign in to comment.