From de8c64e76753ab3d180217e72ede70b16dc8103f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 2 Sep 2017 09:27:11 +0200 Subject: [PATCH 1/2] Use deterministic date for man pages --- cmd/restic/cmd_manpage.go | 8 ++++++++ doc/man/restic-autocomplete.1 | 2 +- doc/man/restic-backup.1 | 2 +- doc/man/restic-cat.1 | 2 +- doc/man/restic-check.1 | 2 +- doc/man/restic-dump.1 | 2 +- doc/man/restic-find.1 | 2 +- doc/man/restic-forget.1 | 2 +- doc/man/restic-init.1 | 2 +- doc/man/restic-key.1 | 2 +- doc/man/restic-list.1 | 2 +- doc/man/restic-ls.1 | 2 +- doc/man/restic-manpage.1 | 2 +- doc/man/restic-migrate.1 | 2 +- doc/man/restic-mount.1 | 2 +- doc/man/restic-prune.1 | 2 +- doc/man/restic-rebuild-index.1 | 2 +- doc/man/restic-restore.1 | 2 +- doc/man/restic-snapshots.1 | 2 +- doc/man/restic-tag.1 | 2 +- doc/man/restic-unlock.1 | 2 +- doc/man/restic-version.1 | 2 +- doc/man/restic.1 | 2 +- 23 files changed, 30 insertions(+), 22 deletions(-) diff --git a/cmd/restic/cmd_manpage.go b/cmd/restic/cmd_manpage.go index 31a85109..46822a66 100644 --- a/cmd/restic/cmd_manpage.go +++ b/cmd/restic/cmd_manpage.go @@ -2,6 +2,7 @@ package main import ( "os" + "time" "github.com/restic/restic/internal/errors" "github.com/spf13/cobra" @@ -31,10 +32,17 @@ func init() { } func runManpage(cmd *cobra.Command, args []string) error { + // use a fixed date for the man pages so that generating them is deterministic + date, err := time.Parse("Jan 2006", "Jan 2017") + if err != nil { + return err + } + header := &doc.GenManHeader{ Title: "restic backup", Section: "1", Source: "generated by `restic manpage`", + Date: &date, } dir := manpageOpts.OutputDir diff --git a/doc/man/restic-autocomplete.1 b/doc/man/restic-autocomplete.1 index 2c598248..ab620dfd 100644 --- a/doc/man/restic-autocomplete.1 +++ b/doc/man/restic-autocomplete.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-backup.1 b/doc/man/restic-backup.1 index 853b3835..d791688d 100644 --- a/doc/man/restic-backup.1 +++ b/doc/man/restic-backup.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-cat.1 b/doc/man/restic-cat.1 index 778a8a4e..38ff1baf 100644 --- a/doc/man/restic-cat.1 +++ b/doc/man/restic-cat.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-check.1 b/doc/man/restic-check.1 index 1af6fbfc..28710cab 100644 --- a/doc/man/restic-check.1 +++ b/doc/man/restic-check.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-dump.1 b/doc/man/restic-dump.1 index 2d6dbfd9..2185b087 100644 --- a/doc/man/restic-dump.1 +++ b/doc/man/restic-dump.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-find.1 b/doc/man/restic-find.1 index a3c61335..d6f8822a 100644 --- a/doc/man/restic-find.1 +++ b/doc/man/restic-find.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-forget.1 b/doc/man/restic-forget.1 index 8007839d..b9a1ff55 100644 --- a/doc/man/restic-forget.1 +++ b/doc/man/restic-forget.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-init.1 b/doc/man/restic-init.1 index 55f85587..ce359042 100644 --- a/doc/man/restic-init.1 +++ b/doc/man/restic-init.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-key.1 b/doc/man/restic-key.1 index b41b2b7b..7eda504a 100644 --- a/doc/man/restic-key.1 +++ b/doc/man/restic-key.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-list.1 b/doc/man/restic-list.1 index 9e5ab4bd..bd19ac0c 100644 --- a/doc/man/restic-list.1 +++ b/doc/man/restic-list.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-ls.1 b/doc/man/restic-ls.1 index 0c79ca07..f7630b83 100644 --- a/doc/man/restic-ls.1 +++ b/doc/man/restic-ls.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-manpage.1 b/doc/man/restic-manpage.1 index 94bc8416..4be44ab8 100644 --- a/doc/man/restic-manpage.1 +++ b/doc/man/restic-manpage.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-migrate.1 b/doc/man/restic-migrate.1 index 2bc2b0c6..0320c159 100644 --- a/doc/man/restic-migrate.1 +++ b/doc/man/restic-migrate.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-mount.1 b/doc/man/restic-mount.1 index 8ebebd04..5bdbda70 100644 --- a/doc/man/restic-mount.1 +++ b/doc/man/restic-mount.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-prune.1 b/doc/man/restic-prune.1 index 69bd7c87..8bdecb8b 100644 --- a/doc/man/restic-prune.1 +++ b/doc/man/restic-prune.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-rebuild-index.1 b/doc/man/restic-rebuild-index.1 index 482a2ff0..eb1f7779 100644 --- a/doc/man/restic-rebuild-index.1 +++ b/doc/man/restic-rebuild-index.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-restore.1 b/doc/man/restic-restore.1 index 8f4d785b..3a774040 100644 --- a/doc/man/restic-restore.1 +++ b/doc/man/restic-restore.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-snapshots.1 b/doc/man/restic-snapshots.1 index ee78a24d..84ade8b7 100644 --- a/doc/man/restic-snapshots.1 +++ b/doc/man/restic-snapshots.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-tag.1 b/doc/man/restic-tag.1 index 7efe1d21..413e24ff 100644 --- a/doc/man/restic-tag.1 +++ b/doc/man/restic-tag.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-unlock.1 b/doc/man/restic-unlock.1 index 8ccfd14b..075a7684 100644 --- a/doc/man/restic-unlock.1 +++ b/doc/man/restic-unlock.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic-version.1 b/doc/man/restic-version.1 index 174343ac..caf8490e 100644 --- a/doc/man/restic-version.1 +++ b/doc/man/restic-version.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l diff --git a/doc/man/restic.1 b/doc/man/restic.1 index 4e564a35..d6b4d8f0 100644 --- a/doc/man/restic.1 +++ b/doc/man/restic.1 @@ -1,4 +1,4 @@ -.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" +.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" .nh .ad l From 3a5805db50945ec643066eb851ee8f674506746a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 2 Sep 2017 09:28:38 +0200 Subject: [PATCH 2/2] Update Go versions for CI --- .travis.yml | 7 +++++-- appveyor.yml | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ad3ad047..37b8c8c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ sudo: false go: - 1.8.3 + - 1.9 - tip os: @@ -17,11 +18,13 @@ matrix: exclude: - os: osx go: tip - - os: linux + - os: osx go: 1.8.3 + - os: linux + go: 1.9 include: - os: linux - go: 1.8.3 + go: 1.9 sudo: true env: RESTIC_TEST_FUSE=1 diff --git a/appveyor.yml b/appveyor.yml index 122d48cf..d512af29 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,8 +17,8 @@ init: install: - rmdir c:\go /s /q - - appveyor DownloadFile https://storage.googleapis.com/golang/go1.8.3.windows-amd64.msi - - msiexec /i go1.8.3.windows-amd64.msi /q + - appveyor DownloadFile https://storage.googleapis.com/golang/go1.9.windows-amd64.msi + - msiexec /i go1.9.windows-amd64.msi /q - go version - go env - appveyor DownloadFile http://sourceforge.netcologne.de/project/gnuwin32/tar/1.13-1/tar-1.13-1-bin.zip -FileName tar.zip