Skip to content

Commit

Permalink
Merge pull request #6 from owncloud/release-template
Browse files Browse the repository at this point in the history
changelog template, centralized docs repo
  • Loading branch information
refs authored Feb 12, 2020
2 parents 0408745 + ec43fd0 commit c7b2470
Show file tree
Hide file tree
Showing 15 changed files with 54 additions and 506 deletions.
52 changes: 32 additions & 20 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -484,13 +484,13 @@ def changelog(ctx):
],
},
{
'name': 'diff',
'image': 'owncloud/alpine:latest',
'pull': 'always',
'commands': [
'git diff',
],
},
'name': 'diff',
'image': 'webhippie/golang:1.13',
'pull': 'always',
'commands': [
'git diff',
],
},
{
'name': 'output',
'image': 'webhippie/golang:1.13',
Expand Down Expand Up @@ -622,26 +622,38 @@ def website(ctx):
},
'steps': [
{
'name': 'generate',
'name': 'prepare',
'image': 'owncloudci/alpine:latest',
'commands': [
'make docs-copy'
],
},
{
'name': 'test',
'image': 'webhippie/hugo:latest',
'pull': 'always',
'commands': [
'make docs',
'cd hugo',
'hugo',
],
},
{
'name': 'publish',
'image': 'plugins/gh-pages:1',
'pull': 'always',
'name': 'list',
'image': 'owncloudci/alpine:latest',
'commands': [
'tree hugo/public',
],
},
{
'name': 'downstream',
'image': 'plugins/downstream',
'settings': {
'username': {
'from_secret': 'github_username',
},
'password': {
'from_secret': 'github_token',
'server': 'https://cloud.drone.io/',
'token': {
'from_secret': 'drone_token',
},
'pages_directory': 'docs/public/',
'temporary_base': 'tmp/',
'repositories': [
'owncloud/owncloud.github.io@source',
],
},
'when': {
'ref': {
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
coverage.out

/bin
/dist
/dist
/hugo
21 changes: 18 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ NAME := ocis-accounts
IMPORT := github.com/owncloud/$(NAME)
BIN := bin
DIST := dist
HUGO := hugo

ifeq ($(OS), Windows_NT)
EXECUTABLE := $(NAME).exe
Expand Down Expand Up @@ -57,7 +58,7 @@ sync:
.PHONY: clean
clean:
go clean -i ./...
rm -rf $(BIN) $(DIST)
rm -rf $(BIN) $(DIST) $(HUGO)

.PHONY: fmt
fmt:
Expand Down Expand Up @@ -130,9 +131,23 @@ release-check:
.PHONY: release-finish
release-finish: release-copy release-check

.PHONY: docs-copy
docs-copy:
mkdir -p $(HUGO); \
cd $(HUGO); \
git init; \
git remote rm origin; \
git remote add origin https://github.com/owncloud/owncloud.github.io; \
git fetch; \
git checkout origin/source -f; \
rsync -aX ../docs/ content/extensions/ocis-accounts

.PHONY: docs-build
docs-build:
cd $(HUGO); hugo

.PHONY: docs
docs:
cd docs; hugo
docs: docs-copy docs-build

.PHONY: watch
watch:
Expand Down
4 changes: 2 additions & 2 deletions changelog/CHANGELOG.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ The following sections list the changes for {{ .Version }}.

## Summary
{{ range $entry := .Entries }}{{ with $entry }}
* {{ .TypeShort }} #{{ .PrimaryID }}: {{ .Title }}
* {{ .Type }} - {{ .Title }}: [#{{ .PrimaryID }}]({{ .PrimaryURL }})
{{- end }}{{ end }}

## Details
{{ range $entry := .Entries }}{{ with $entry }}
* {{ .Type }} #{{ .PrimaryID }}: {{ .Title }}
* {{ .Type }} - {{ .Title }}: [#{{ .PrimaryID }}]({{ .PrimaryURL }})
{{ range $par := .Paragraphs }}
{{ wrapIndent $par 80 3 }}
{{ end -}}
Expand Down
File renamed without changes.
6 changes: 0 additions & 6 deletions docs/archetypes/default.md

This file was deleted.

File renamed without changes.
18 changes: 0 additions & 18 deletions docs/config.toml

This file was deleted.

File renamed without changes.
Empty file removed docs/layouts/_default/list.html
Empty file.
Empty file removed docs/layouts/_default/single.html
Empty file.
57 changes: 0 additions & 57 deletions docs/layouts/index.html

This file was deleted.

2 changes: 0 additions & 2 deletions docs/layouts/partials/style.html

This file was deleted.

Loading

0 comments on commit c7b2470

Please sign in to comment.