Merge pull request #79 from owncloud/release-0.12.0

Release 0.12.0
owncloud · Aug 20, 2020 · 169b761 · 169b761
2 parents 5421019 + c80a470
commit 169b761
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 35 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ IMPORT := github.com/owncloud/$(NAME)
 BIN := bin
 DIST := dist
 HUGO := hugo
-PHOENIX_ASSETS_VERSION = v0.14.0
+PHOENIX_ASSETS_VERSION = v0.15.0
 
 ifeq ($(OS), Windows_NT)
 	EXECUTABLE := $(NAME).exe

diff --git a/changelog/unreleased/enable-external-apps.md → ...0.12.0_2020-08-19/enable-external-apps.md b/changelog/unreleased/enable-external-apps.md → ...0.12.0_2020-08-19/enable-external-apps.md
diff --git a/changelog/0.12.0_2020-08-19/update-phoenix.md b/changelog/0.12.0_2020-08-19/update-phoenix.md
@@ -0,0 +1,6 @@
+Change: update Phoenix
+
+Updated phoenix from v0.14.0 to v0.15.0
+
+https://github.com/owncloud/ocis-phoenix/pull/79
+https://github.com/owncloud/phoenix/releases/tag/v0.15.0
diff --git a/docs/releasing.md b/docs/releasing.md
@@ -33,7 +33,7 @@ and take note of its release tag name.
 3. Move all changelog items from the `changelog/unreleased/` folder to the `$major.$minor.$patchVersion_YYYY-MM-DD` folder.
 4. Update the go module `ocis-pkg` to the latest version <https://blog.golang.org/using-go-modules> .
 5. Update the phoenix asset by adjusting the value of `PHOENIX_ASSETS_VERSION` at the top of the Makefile and specify the tag name of the latest [Phoenix release](https://github.com/owncloud/phoenix/tags).
-6. Run `make generate`.
+6. Run `make clean generate`.
 7. Create a changelog item for the update in the `changelog/$major.$minor.$patchVersion_YYYY-MM-DD` folder.
 8. Commit your changes.
 9. After merging, wait for the CI to run on the merge commit.

diff --git a/pkg/assets/embed.go b/pkg/assets/embed.go