Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update phoenix 0.29.0 #1034

Merged
merged 3 commits into from
Dec 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ config = {
},
'uiTests': {
'phoenixBranch': 'master',
'phoenixCommit': '1308ee9ed52bfe92ed1a3bc8489a0ab7ae5d1c5c',
'phoenixCommit': 'c136a4347548b022078294ea09f4eaa628a26097',
'suites': {
'webUIBasic': [
'webUILogin',
Expand Down Expand Up @@ -610,7 +610,7 @@ def uiTestPipeline(ctx, suiteName, phoenixBranch = 'master', phoenixCommit = '',
ocisServer(storage, accounts_hash_difficulty) + [
{
'name': 'webUITests',
'image': 'owncloudci/nodejs:11',
'image': 'webhippie/nodejs:latest',
'pull': 'always',
'environment': {
'SERVER_HOST': 'https://ocis-server:9200',
Expand Down Expand Up @@ -682,7 +682,7 @@ def accountsUITests(ctx, phoenixBranch, phoenixCommit, storage = 'owncloud', acc
ocisServer(storage, accounts_hash_difficulty) + [
{
'name': 'WebUIAcceptanceTests',
'image': 'owncloudci/nodejs:11',
'image': 'webhippie/nodejs:latest',
'pull': 'always',
'environment': {
'SERVER_HOST': 'https://ocis-server:9200',
Expand Down
8 changes: 8 additions & 0 deletions changelog/unreleased/update-phoenix-0.29.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Change: Update phoenix to v0.29.0

Tags: web

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

https://github.com/owncloud/ocis/pull/1034
https://github.com/owncloud/phoenix/releases/tag/v0.29.0
9 changes: 5 additions & 4 deletions 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.28.0
PHOENIX_ASSETS_VERSION = v0.29.0

ifeq ($(OS), Windows_NT)
EXECUTABLE := $(NAME).exe
Expand Down Expand Up @@ -77,7 +77,7 @@ lint:
for PKG in $(PACKAGES); do go run golang.org/x/lint/golint -set_exit_status $$PKG || exit 1; done;

.PHONY: generate
generate: assets
generate: pull-assets
go generate $(GENERATE)

.PHONY: changelog
Expand Down Expand Up @@ -178,5 +178,6 @@ watch:
# .PHONY: protobuf
# protobuf: $(GOPATH)/bin/protoc-gen-go $(GOPATH)/bin/protoc-gen-micro $(GOPATH)/bin/protoc-gen-microweb $(GOPATH)/bin/protoc-gen-swagger pkg/proto/v0/example.pb.go pkg/proto/v0/example.pb.micro.go pkg/proto/v0/example.pb.web.go pkg/proto/v0/example.swagger.json

assets:
mkdir assets/ && curl -slL -o- https://github.com/owncloud/phoenix/releases/download/$(PHOENIX_ASSETS_VERSION)/phoenix.tar.gz | tar xvzf - -C assets/
.PHONY: pull-assets
pull-assets:
rm -Rf assets && mkdir assets/ && curl -slL -o- https://github.com/owncloud/phoenix/releases/download/$(PHOENIX_ASSETS_VERSION)/phoenix.tar.gz | tar xvzf - -C assets/
60 changes: 30 additions & 30 deletions ocis-phoenix/pkg/assets/embed.go

Large diffs are not rendered by default.