~evanj/evanjon.es

faba9f7a3f26946d269d1418ca27f20b3bf331a2 — Evan M Jones 1 year, 5 months ago fea4174
Fix(.build.yml): Stuffing `go get` in root Go file for CI.
5 files changed, 20 insertions(+), 2 deletions(-)

M evanjon.es.go
M go.mod
M go.sum
M internal/s/tmpl/tmpls_embed.go
M vendor/modules.txt
M evanjon.es.go => evanjon.es.go +2 -0
@@ 18,6 18,8 @@ import (
	api "git.sr.ht/~evanj/evanjon.es/pkg/cms"
)

//go:generate go get git.sr.ht/~evanj/embed

type App struct {
	log          *log.Logger
	baseRouter   http.Handler

M go.mod => go.mod +1 -0
@@ 3,6 3,7 @@ module git.sr.ht/~evanj/evanjon.es
go 1.14

require (
	git.sr.ht/~evanj/embed v0.0.0-20200525225021-2cde7dae7bfa // indirect
	github.com/gorilla/feeds v1.1.1
	github.com/kr/pretty v0.2.0 // indirect
	github.com/tdewolff/minify/v2 v2.7.3

M go.sum => go.sum +15 -0
@@ 1,3 1,6 @@
git.sr.ht/~evanj/embed v0.0.0-20200525225021-2cde7dae7bfa h1:gpQ2a3/AYs0o1F/kg2V2GIUIS8pPkvoSlJPZCbF9Mvw=
git.sr.ht/~evanj/embed v0.0.0-20200525225021-2cde7dae7bfa/go.mod h1:o3sadZPJeN9scjfsbpsABLF2nNr6qUqMMkGLfCCsILc=
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U=
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=


@@ 16,4 19,16 @@ github.com/tdewolff/parse/v2 v2.4.2 h1:Bu2Qv6wepkc+Ou7iB/qHjAhEImlAP5vedzlQRUdj3
github.com/tdewolff/parse/v2 v2.4.2/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho=
github.com/tdewolff/test v1.0.6 h1:76mzYJQ83Op284kMT+63iCNCI7NEERsIN8dLM+RiKr4=
github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20181031143558-9b800f95dbbc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20200301222351-066e0c02454c h1:FD7jysxM+EJqg5UYYy3XYDsAiUickFsn4UiaanJkf8c=
golang.org/x/tools v0.0.0-20200301222351-066e0c02454c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

M internal/s/tmpl/tmpls_embed.go => internal/s/tmpl/tmpls_embed.go +0 -2
@@ 16,8 16,6 @@ func init() {

	tmpls["css/main.css"] = tostring("Ym9keSB7IAogIGxpbmUtaGVpZ2h0OiAxLjQ7Cn0KCnByZSB7IAogIGxpbmUtaGllZ2h0OiAxOwp9CgpoZWFkZXIgaDEgeyAKICBtYXJnaW46IDA7Cn0KCmhlYWRlciBoMSBhLAphIHsKICB0ZXh0LWRlY29yYXRpb246IG5vbmU7Cn0KCmE6aG92ZXIgewogIHRleHQtZGVjb3JhdGlvbjogdW5kZXJsaW5lOwp9Cgpib2R5IG1haW4geyAKICBwYWRkaW5nOiAxNXB4OwogIG1heC13aWR0aDogNTAwcHg7Cn0KCmJsb2NrcXVvdGUgeyAKICBtYXJnaW4tbGVmdDogaW5pdGlhbDsKICBmb250LXN0eWxlOiBpdGFsaWM7Cn0KCmJsb2NrcXVvdGUgKyBjaXRlLApibG9ja3F1b3RlICsgcCA+IGNpdGUsCmJsb2NrcXVvdGUgKyBwID4gZW0gewogIGRpc3BsYXk6IGJsb2NrOyAKICBtYXJnaW4tdG9wOiAtMTBweDsKfQoKYmxvY2txdW90ZSArIGNpdGU6YmVmb3JlLApibG9ja3F1b3RlICsgcCA+IGNpdGU6YmVmb3JlLApibG9ja3F1b3RlICsgcCA+IGVtOmJlZm9yZSB7IAogIGZvbnQtc3R5bGU6IGl0YWxpYzsKICBjb250ZW50OiAnLS0gJzsKICBwYWRkaW5nLWxlZnQ6IDQwcHg7Cn0KCmJvZHkubGlzdCA+IG1haW4gPiBhIHsKICB0ZXh0LWRlY29yYXRpb246IG5vbmU7Cn0KCmJvZHkubGlzdCA+IG1haW4gPiBhOmhvdmVyID4gc2VjdGlvbiA+IGgyIHsKICB0ZXh0LWRlY29yYXRpb246IHVuZGVybGluZTsKfQoKYm9keS5saXN0ID4gbWFpbiA+IGEgPiBzZWN0aW9uID4gaDIgewogIG1hcmdpbi10b3A6IDA7CiAgbWFyZ2luLWJvdHRvbTogMDsKfQoKYm9keS5saXN0ID4gbWFpbiA+IGEgPiBzZWN0aW9uID4gZGl2IHsgCiAgbWFyZ2luLWxlZnQ6IDQwcHg7Cn0KCmltZyB7IAogIG1heC13aWR0aDogMTAwJSU7CiAgdmVydGljYWwtYWxpZ246IG1pZGRsZTsKfQo=")

	tmpls["css/main.css.backup"] = tostring("Ym9keSB7CiAgYmFja2dyb3VuZDogI2Y2ZjZmNjsKfQoKQG1lZGlhIChtYXgtd2lkdGg6IDc2OHB4KSB7IAogIGJvZHkgewogICAgbWFyZ2luOiAwOwogIH0KfQoKYm9keSA+IGRpdiB7IAogIG1hcmdpbi1sZWZ0OiBhdXRvOwogIG1hcmdpbi1yaWdodDogYXV0bzsKICBtYXgtd2lkdGg6IDgwY2g7CiAgZGlzcGxheTogYmxvY2s7CiAgcGFkZGluZzogMTBweDsKICBiYWNrZ3JvdW5kOiB3aGl0ZTsKfQoKcCwgaDEsIGgyLCBoMywgaDQsIGg1LCBoNiB7IAogIG1hcmdpbjogMDsKfQoKLmxpc3QgPiAudGhpbmcgewogIG1hcmdpbi1sZWZ0OiAyNXB4Owp9CgoubGluaywKLmxpbmsgKiB7IAogIHRleHQtZGVjb3JhdGlvbjogbm9uZTsKfQoKLmxpbmsgLmFjdGl2ZSB7CiAgdGV4dC1kZWNvcmF0aW9uOiB1bmRlcmxpbmU7Cn0KCi5saW5rIC5pbmFjdGl2ZSB7CiAgY29sb3I6IGluaXRpYWw7Cn0KCmJvZHkgeyAKICBsaW5lLWhlaWdodDogMS40Owp9CgptYWluIGFydGljbGUgPiAqOm5vdChjaXRlKSB7IAogIG1hcmdpbi10b3A6IDI1cHg7CiAgbWFyZ2luLWJvdHRvbTogMjVweDsKfQoKbWFpbiBhcnRpY2xlIGNpdGUgeyAKICAvKiBBc3N1bWUgd2UgaGF2ZSBhIGJsb2NrcXVvdGUgZGlyZWN0bHkgYmVmb3JlIHVzLiAqLwogIG1hcmdpbi10b3A6IC0yNXB4OwogIGRpc3BsYXk6IGJsb2NrOwp9CgpibG9ja3F1b3RlIHsgCiAgbWFyZ2luOiAwOwogIHBhZGRpbmc6IDA7CiAgZm9udC1zdHlsZTogaXRhbGljOwp9CgpjaXRlIHsgCiAgZm9udC1zdHlsZTogbm9ybWFsOwp9CgpjaXRlOmJlZm9yZSB7IAogIGNvbnRlbnQ6ICctLSAnOwogIG1hcmdpbi1sZWZ0OiAyNXB4Owp9CgpiciB7IAogIGRpc3BsYXk6IGJsb2NrOwogIGNvbnRlbnQ6ICcgJzsKICBtYXJnaW46IDI1cHggMDsKfQoKaW1nIHsgCiAgbWF4LXdpZHRoOiAxMDAlJTsKICB2ZXJ0aWNhbC1hbGlnbjogbWlkZGxlOwp9Cg==")

	tmpls["html/_head.html"] = tostring("PG1ldGEgY2hhcnNldD0idXRmLTgiPgo8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2aWNlLXdpZHRoLCBpbml0aWFsLXNjYWxlPTEiPgo=")

	tmpls["html/index.html"] = tostring("PCFET0NUWVBFIGh0bWw+CjxodG1sIGxhbmc9ZW4+CjxoZWFkPgogIHt7IHRlbXBsYXRlICJodG1sL19oZWFkLmh0bWwiIH19CiAgPHRpdGxlPkV2YW4ncyBTaXRlPC90aXRsZT4KICA8bWV0YSBuYW1lPWRlc2NyaXB0aW9uIGNvbnRlbnQ9Int7IC5JdGVtLlNob3J0IH19Ij4KPC9oZWFkPgo8Ym9keT4KICA8c3R5bGU+e3sgdGVtcGxhdGUgImNzcy9tYWluLmNzcyIgfX08L3N0eWxlPgogIDxtYWluPgogICAgPGhlYWRlcj4KICAgICAgPHRhYmxlPiAKICAgICAgICA8dHI+CiAgICAgICAgICA8dGQgdmFsaWduPWJvdHRvbSB3aWR0aD05NCBoZWlnaHQ9Nzk+CiAgICAgICAgICAgIDxpbWcgYWx0PSJUaGUgJ2JyYW5kJyBpbWFnZSBvZiB0aGUgd2Vic2l0ZTsgaXQncyBhIGNsb3NlIG9mIHVwIENoYXJsZXMnIGZhY2UgZnJvbSBFdXJla2EgNyIgc3JjPSIvL2UzLmV2YW5qb24uZXMvYjg4OWJkM2UtNDQwNC00OWI3LTZhMjUtNmNlMjgzODg2OGY2LmpwZyIvPgogICAgICAgICAgPC90ZD4KICAgICAgICAgIDx0ZCB2YWxpZ249Ym90dG9tPgogICAgICAgICAgICA8aDE+PGEgaHJlZj0nLyc+e3sgLkl0ZW0uTmFtZSB9fTwvYT48L2gxPgogICAgICAgICAgPC90ZD4KICAgICAgICA8L3RyPgogICAgICA8L3RhYmxlPgogICAgPC9oZWFkZXI+CiAgICA8YXJ0aWNsZT57eyAuSXRlbS5EZXNjIH19PC9hcnRpY2xlPgogICAgPGhyPgogICAgPGEgaHJlZj0naHR0cHM6Ly9naXQuc3IuaHQvfmV2YW5qL2V2YW5qb24uZXMvJz5Tb3VyY2UgQ29kZTwvYT4sIAogICAgPGEgaHJlZj0nbWFpbHRvOm1lQGV2YW5qb24uZXMnPkVtYWlsPC9hPiwgCiAgICA8YSBocmVmPScvcnNzJz5SU1MgRmVlZDwvYT4sIAogICAgPGEgaHJlZj0naHR0cHM6Ly9lMy5ldmFuam9uLmVzLzI1ZGNlNjAxLTdkYWItNDY0Ny02ZjU0LTRkMjcxMGVmMThmYS5ncGcnPkdQRzwvYT4KICAgIDxocj4KICAgIDxmb290ZXI+TGFzdCBlZGl0IHt7IC5JdGVtLlByZXR0eURhdGUgfX08L2Zvb3Rlcj4KICA8L21haW4+CjwvYm9keT4KCjwvaHRtbD4K")

M vendor/modules.txt => vendor/modules.txt +2 -0
@@ 1,3 1,5 @@
# git.sr.ht/~evanj/embed v0.0.0-20200525225021-2cde7dae7bfa
## explicit
# github.com/gorilla/feeds v1.1.1
## explicit
github.com/gorilla/feeds