Align CI, Docs and Changelog

2020-02-24 14:48:22 +01:00
parent 761757e28a
commit 0fa10141d6
8 changed files with 122 additions and 19 deletions
@@ -368,9 +368,10 @@ def binary(ctx, name):
          'files': [
            'dist/release/*',
          ],
-          'title': ctx.build.ref.replace("refs/tags/", ""),
+          'title': ctx.build.ref.replace("refs/tags/v", ""),
          'note': 'dist/CHANGELOG.md',
          'overwrite': True,
+          'prerelease': len(ctx.build.ref.split("-")) > 1,
        },
        'when': {
          'ref': [
@@ -441,6 +442,7 @@ def manifest(ctx):
  }

 def changelog(ctx):
+  repo_slug = ctx.build.source_repo if ctx.build.source_repo else ctx.repo.slug
  return {
    'kind': 'pipeline',
    'type': 'docker',
@@ -461,8 +463,8 @@ def changelog(ctx):
          'actions': [
            'clone',
          ],
-          'remote': 'https://github.com/%s' % (ctx.repo.slug),
-          'branch': ctx.build.branch if ctx.build.event == 'pull_request' else 'master',
+          'remote': 'https://github.com/%s' % (repo_slug),
+          'branch': ctx.build.source if ctx.build.event == 'pull_request' else 'master',
          'path': '/drone/src',
          'netrc_machine': 'github.com',
          'netrc_username': {
@@ -481,6 +483,14 @@ def changelog(ctx):
          'make changelog',
        ],
      },
+      {
+        'name': 'diff',
+        'image': 'webhippie/golang:1.13',
+        'pull': 'always',
+        'commands': [
+          'git diff',
+        ],
+      },
      {
        'name': 'output',
        'image': 'webhippie/golang:1.13',
@@ -525,7 +535,7 @@ def changelog(ctx):
    'trigger': {
      'ref': [
        'refs/heads/master',
-        'refs/tags/**',
+        'refs/pull/**',
      ],
    },
  }
@@ -612,11 +622,25 @@ def website(ctx):
    },
    'steps': [
      {
-        'name': 'generate',
-        'image': 'webhippie/hugo:latest',
-        'pull': 'always',
+        'name': 'prepare',
+        'image': 'owncloudci/alpine:latest',
        'commands': [
-          'make docs',
+          'make docs-copy'
+        ],
+      },
+      {
+        'name': 'test',
+        'image': 'webhippie/hugo:latest',
+        'commands': [
+          'cd hugo',
+          'hugo',
+        ],
+      },
+      {
+        'name': 'list',
+        'image': 'owncloudci/alpine:latest',
+        'commands': [
+          'tree hugo/public',
        ],
      },
      {
@@ -630,8 +654,28 @@ def website(ctx):
          'password': {
            'from_secret': 'github_token',
          },
-          'pages_directory': 'docs/public/',
-          'temporary_base': 'tmp/',
+          'pages_directory': 'docs/',
+          'target_branch': 'docs',
+        },
+        'when': {
+          'ref': {
+            'exclude': [
+              'refs/pull/**',
+            ],
+          },
+        },
+      },
+      {
+        'name': 'downstream',
+        'image': 'plugins/downstream',
+        'settings': {
+          'server': 'https://cloud.drone.io/',
+          'token': {
+            'from_secret': 'drone_token',
+          },
+          'repositories': [
+            'owncloud/owncloud.github.io@source',
+          ],
        },
        'when': {
          'ref': {
@@ -2,5 +2,6 @@ coverage.out

 /bin
 /dist
+/hugo
 server.crt
 server.key
@@ -3,6 +3,7 @@ NAME := ocis-konnectd
 IMPORT := github.com/owncloud/$(NAME)
 BIN := bin
 DIST := dist
+HUGO := hugo

 ifeq ($(OS), Windows_NT)
 	EXECUTABLE := $(NAME).exe
@@ -130,9 +131,24 @@ release-check:
 .PHONY: release-finish
 release-finish: release-copy release-check

+.PHONY: docs-copy
+docs-copy:
+	mkdir -p $(HUGO); \
+	mkdir -p $(HUGO)/content/extensions; \
+	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 --delete -ax ../docs/ content/extensions/$(NAME)
+
+.PHONY: docs-build
+docs-build:
+	cd $(HUGO); hugo
+
 .PHONY: docs
-docs:
-	cd docs; hugo
+docs: docs-copy docs-build

 .PHONY: watch
 watch:
@@ -1,18 +1,40 @@
-{{- range $changes := . }}{{ with $changes -}}
-# Changelog for {{ .Version }}
+{{ $allVersions := . }}
+{{- range $index, $changes := . }}{{ with $changes -}}
+# Changelog for [{{ .Version }}] ({{ .Date }})

 The following sections list the changes for {{ .Version }}.

+{{ if gt (len $allVersions) 1 -}}
+{{/* creating version compare links */ -}}
+{{ $next := add1 $index -}}
+{{ if ne (len $allVersions) $next -}}
+{{ $previousVersion := (index $allVersions $next).Version -}}
+{{ if eq .Version "unreleased" -}}
+[{{ .Version }}]: https://github.com/owncloud/ocis-konnectd/compare/v{{ $previousVersion }}...master
+
+{{ else -}}
+[{{ .Version }}]: https://github.com/owncloud/ocis-konnectd/compare/v{{ $previousVersion }}...v{{ .Version }}
+
+{{ end -}}
+{{ end -}}
+
+{{- /* last version managed by calens, end of the loop */ -}}
+{{ if eq .Version "0.1.0" -}}
+[{{ .Version }}]: https://github.com/owncloud/ocis-konnectd/compare/66337bb4dad4a3202880323adf7a51a1a3bb4085...v{{ .Version }}
+
+{{ end -}}
+{{- end -}}
+
 ## Summary
 {{ range $entry := .Entries }}{{ with $entry }}
- * {{ .TypeShort }} #{{ .PrimaryID }}: {{ .Title }}
+* {{ .Type }} #{{ .PrimaryID }}: {{ .Title }}
 {{- end }}{{ end }}

 ## Details
 {{ range $entry := .Entries }}{{ with $entry }}
- * {{ .Type }} #{{ .PrimaryID }}: {{ .Title }}
+* {{ .Type }} #{{ .PrimaryID }}: {{ .Title }}
 {{ range $par := .Paragraphs }}
-   {{ wrap $par 80 3 }}
+   {{ wrapIndent $par 80 3 }}
 {{ end -}}
 {{ range $url := .IssueURLs }}
   {{ $url -}}
@@ -23,6 +45,6 @@ The following sections list the changes for {{ .Version }}.
 {{ range $url := .OtherURLs }}
   {{ $url -}}
 {{ end }}
-{{ end }}{{ end }}

 {{ end }}{{ end -}}
+{{ end }}{{ end -}}
@@ -1,5 +1,6 @@
 ---
-title: ocis-konnectd
+title: Konnectd
+anchor: ocis-konnectd
 ---

 This service provides an OpenID Connect provider which is the default way to authenticate in OCIS.
@@ -16,6 +16,7 @@ require (
 	github.com/oklog/run v1.0.0
 	github.com/openzipkin/zipkin-go v0.2.2
 	github.com/owncloud/ocis-pkg/v2 v2.0.1
+	github.com/restic/calens v0.2.0
 	github.com/rs/zerolog v1.17.2
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/afero v1.2.2 // indirect
@@ -37,6 +37,12 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/IljaN/konnect v0.29.0-alpha2 h1:1p8+000BVllYPlago1X4gFNWaqQp7iTCM9DA7EoJExk=
 github.com/IljaN/konnect v0.29.0-alpha2/go.mod h1:4Q7yo5HXdvjvAGXz6PGAcEfQ4EuRQrVUuUPbMqy7mw8=
+github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg=
+github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
+github.com/Masterminds/semver/v3 v3.0.2 h1:tRi7ENs+AaOUCH+j6qwNQgPYfV26dX3JNonq+V4mhqc=
+github.com/Masterminds/semver/v3 v3.0.2/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
+github.com/Masterminds/sprig/v3 v3.0.1 h1:RuaOafp+8qOLUPX1lInLfUrLc1MEVbnz7a40RLoixKY=
+github.com/Masterminds/sprig/v3 v3.0.1/go.mod h1:Cp7HwZjmqKrC+Y7XqSJOU2yRvAJRGLiohfgz5ZJj8+4=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
 github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
@@ -194,6 +200,7 @@ github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEK
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible/go.mod h1:qf9acutJ8cwBUhm1bqgz6Bei9/C/c93FPDljKWwsOgM=
+github.com/go-test/deep v1.0.1 h1:UQhStjbkDClarlmv0am7OXXO4/GaPdCGiUiMTvi28sg=
 github.com/go-test/deep v1.0.1/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
@@ -276,8 +283,12 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T
 github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5/go.mod h1:0YZ2wQSuwviXXXGUiK6zXzskyBLAbLXhamxzcFHSLoM=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0=
+github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
 github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df/go.mod h1:QMZY7/J/KSQEhKWFeDesPjMj+wCHReeknARU3wqlyN4=
 github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd/go.mod h1:3LVOLeyx9XVvwPgrt2be44XgSqndprz1G18rSk8KD84=
+github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ=
 github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
@@ -385,6 +396,8 @@ github.com/miekg/dns v1.1.22 h1:Jm64b3bO9kP43ddLjL2EY3Io6bmy1qGb9Xxz6TqS6rc=
 github.com/miekg/dns v1.1.22/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 github.com/miekg/dns v1.1.27 h1:aEH/kqUzUxGJ/UHcEKdJY+ugH6WEzsEBBSPa8zuy1aM=
 github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
+github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed/go.mod h1:3rdaFaCv4AyBgu5ALFM0+tSuHrBh6v692nyQe3ikrq0=
 github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
@@ -394,6 +407,8 @@ github.com/mitchellh/hashstructure v1.0.0 h1:ZkRJX1CyOoTkar7p/mLS5TZU4nJ1Rn/F8u9
 github.com/mitchellh/hashstructure v1.0.0/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -512,6 +527,8 @@ github.com/rainycape/memcache v0.0.0-20150622160815-1031fa0ce2f2/go.mod h1:7tZKc
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/restic/calens v0.1.0 h1:RHGokdZ72dICyIz1EjEsfZwUhvNZz/zy2SawxJktdWA=
 github.com/restic/calens v0.1.0/go.mod h1:u67f5msOjCTDYNzOf/NoAUSdmXP03YXPCwIQLYADy5M=
+github.com/restic/calens v0.2.0 h1:LVNAtmFc+Pb4ODX66qdX1T3Di1P0OTLyUsVyvM/xD7E=
+github.com/restic/calens v0.2.0/go.mod h1:UXwyAKS4wsgUZGEc7NrzzygJbLsQZIo3wl+62Q1wvmU=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
@@ -4,4 +4,5 @@ package main

 import (
 	_ "github.com/UnnoTed/fileb0x"
+	_ "github.com/restic/calens"
 )