From faf6ff3f8ba88001858060d888214750f86b35de Mon Sep 17 00:00:00 2001 From: Mark Bates Date: Wed, 27 Nov 2019 14:36:59 -0500 Subject: [PATCH] v0.15.2 (#1853) --- .github/workflows/release.yml | 28 ++++++++ .github/workflows/tests.yml | 27 +++++++ .goreleaser.yml | 78 ++++++++++---------- .goreleaser.yml.plush | 44 ------------ azure-pipelines.yml | 66 ----------------- azure-tests.yml | 19 ----- go.mod | 12 ++-- go.sum | 24 ++++--- it.sh | 129 ---------------------------------- options.go | 5 +- packrd/packed-packr.go | 11 +++ runtime/version.go | 2 +- 12 files changed, 129 insertions(+), 316 deletions(-) create mode 100644 .github/workflows/release.yml create mode 100644 .github/workflows/tests.yml delete mode 100644 .goreleaser.yml.plush delete mode 100644 azure-pipelines.yml delete mode 100644 azure-tests.yml delete mode 100644 it.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..60d9d7b16 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,28 @@ +name: Release +on: + release: + types: + - published + +jobs: + release: + name: Release + runs-on: ubuntu-latest + steps: + - + name: Set up Go 1.13 + uses: actions/setup-go@v1 + with: + go-version: 1.13 + id: go + - + name: Checkout Code + uses: actions/checkout@master + - + name: Run GoReleaser + env: + GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }} + uses: goreleaser/goreleaser-action@v1 + with: + version: latest + args: release --rm-dist diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 000000000..31a582105 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,27 @@ +name: Tests +on: [push] +jobs: + + + tests-off: + name: (GOPATH) ${{matrix.go-version}} ${{matrix.os}} + runs-on: ${{ matrix.os }} + strategy: + matrix: + go-version: [1.12.x, 1.13.x] + os: [macos-latest, windows-latest, ubuntu-latest] + env: + GO111MODULE: on + steps: + - name: Checkout code + uses: actions/checkout@v1 + with: + fetch-depth: 1 + path: src/github.com/${{ github.repository }} + - name: Test + env: + GOPATH: ${{runner.workspace}} + run: | + go mod tidy -v + go test -tags "sqlite integration_test" -cover -race ./... + diff --git a/.goreleaser.yml b/.goreleaser.yml index 7d9379d34..ce7fef0ce 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,47 +1,45 @@ -# Code generated by github.com/gobuffalo/release. DO NOT EDIT. -# Edit .goreleaser.yml.plush instead - builds: -- - goos: - - darwin - - linux - - windows - goarch: - - amd64 - - 386 - - arm - - arm64 - goarm: - - 6 - - 7 - env: - - CGO_ENABLED=0 - main: ./buffalo/main.go - binary: buffalo - + - + main: ./buffalo/main.go + env: + - CGO_ENABLED=0 + ldflags: + - -s -w -X "github.com/gobuffalo/buffalo/runtime.Version={{.Tag}}" + goos: + - darwin + - linux + - windows + goarch: + - amd64 + - 386 + - arm + - arm64 + goarm: + - 6 + - 7 +archives: + - + replacements: + '386': i386 + darwin: Darwin + linux: Linux + windows: Windows + amd64: x86_64 checksum: - name_template: 'checksums.txt' - + name_template: checksums.txt snapshot: - name_template: "{{ .Tag }}-next" - + name_template: '{{ .Tag }}-next' changelog: sort: asc filters: exclude: - - '^docs:' - - '^test:' - -brew: - name: buffalo - github: - owner: gobuffalo - name: homebrew-tap - homepage: https://gobuffalo.io - description: A Go web development eco-system, designed to make your life easier. - install: | - bin.install "buffalo" - test: | - system "#{bin}/buffalo", "version" - + - '^docs:' + - '^test:' +brews: + - + name: 'buffalo' + github: + owner: 'gobuffalo' + name: 'homebrew-tap' + install: | + bin.install "buffalo" diff --git a/.goreleaser.yml.plush b/.goreleaser.yml.plush deleted file mode 100644 index 0eb62a192..000000000 --- a/.goreleaser.yml.plush +++ /dev/null @@ -1,44 +0,0 @@ -builds: -- - goos: - - darwin - - linux - - windows - goarch: - - amd64 - - 386 - - arm - - arm64 - goarm: - - 6 - - 7 - env: - - CGO_ENABLED=0 - main: ./buffalo/main.go - binary: buffalo - -checksum: - name_template: 'checksums.txt' - -snapshot: - name_template: "{{ .Tag }}-next" - -changelog: - sort: asc - filters: - exclude: - - '^docs:' - - '^test:' -<%= if (brew) { %> -brew: - name: buffalo - github: - owner: gobuffalo - name: homebrew-tap - homepage: https://gobuffalo.io - description: A Go web development eco-system, designed to make your life easier. - install: | - bin.install "buffalo" - test: | - system "#{bin}/buffalo", "version" -<% } %> diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index c91e86546..000000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,66 +0,0 @@ -variables: - GOPROXY: "https://proxy.golang.org" - GOBIN: "$(GOPATH)/bin" # Go binaries path - GOPATH: "$(system.defaultWorkingDirectory)/gopath" # Go workspace path - modulePath: "$(GOPATH)/src/github.com/$(build.repository.name)" # Path to the module"s code - -jobs: -- job: Windows - pool: - vmImage: "vs2017-win2016" - strategy: - matrix: - go 1.12 (on): - go_version: "1.12.13" - GO111MODULE: "on" - go 1.12 (off): - go_version: "1.12.13" - GO111MODULE: "off" - go 1.13.4 (on): - go_version: "1.13.4" - GO111MODULE: "on" - go 1.13.4 (off): - go_version: "1.13.4" - GO111MODULE: "off" - steps: - - template: azure-tests.yml - -- job: macOS - pool: - vmImage: "macOS-10.13" - strategy: - matrix: - go 1.12 (on): - go_version: "1.12.13" - GO111MODULE: "on" - go 1.12 (off): - go_version: "1.12.13" - GO111MODULE: "off" - go 1.13.4 (on): - go_version: "1.13.4" - GO111MODULE: "on" - go 1.13.4 (off): - go_version: "1.13.4" - GO111MODULE: "off" - steps: - - template: azure-tests.yml - -- job: Linux - pool: - vmImage: "ubuntu-16.04" - strategy: - matrix: - go 1.12 (on): - go_version: "1.12.13" - GO111MODULE: "on" - go 1.12 (off): - go_version: "1.12.13" - GO111MODULE: "off" - go 1.13.4 (on): - go_version: "1.13.4" - GO111MODULE: "on" - go 1.13.4 (off): - go_version: "1.13.4" - GO111MODULE: "off" - steps: - - template: azure-tests.yml diff --git a/azure-tests.yml b/azure-tests.yml deleted file mode 100644 index a56797a2d..000000000 --- a/azure-tests.yml +++ /dev/null @@ -1,19 +0,0 @@ -steps: - - task: GoTool@0 - inputs: - version: $(go_version) - - task: Bash@3 - inputs: - targetType: inline - script: | - mkdir -p "$(GOBIN)" - mkdir -p "$(GOPATH)/pkg" - mkdir -p "$(modulePath)" - shopt -s extglob - mv !(gopath) "$(modulePath)" - displayName: "Setup Go Workspace" - - script: | - go get -tags "sqlite integration_test" -t -v ./... - go test -tags "sqlite integration_test" -race ./... - workingDirectory: "$(modulePath)" - displayName: "Tests" diff --git a/go.mod b/go.mod index 3075ebc6a..516d55c22 100644 --- a/go.mod +++ b/go.mod @@ -9,16 +9,16 @@ require ( github.com/gobuffalo/attrs v0.1.0 github.com/gobuffalo/buffalo-pop v1.23.1 github.com/gobuffalo/clara v0.9.1 - github.com/gobuffalo/envy v1.7.1 + github.com/gobuffalo/envy v1.8.1 github.com/gobuffalo/events v1.4.0 - github.com/gobuffalo/flect v0.1.6 + github.com/gobuffalo/flect v0.1.7 github.com/gobuffalo/genny v0.4.1 github.com/gobuffalo/github_flavored_markdown v1.1.0 github.com/gobuffalo/helpers v0.4.0 github.com/gobuffalo/httptest v1.4.0 github.com/gobuffalo/licenser v1.4.0 - github.com/gobuffalo/logger v1.0.1 - github.com/gobuffalo/meta v0.2.0 + github.com/gobuffalo/logger v1.0.3 + github.com/gobuffalo/meta v0.2.1 github.com/gobuffalo/nulls v0.1.0 github.com/gobuffalo/packd v0.3.0 github.com/gobuffalo/packr/v2 v2.7.1 @@ -42,7 +42,7 @@ require ( github.com/spf13/viper v1.5.0 github.com/stretchr/testify v1.4.0 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e - golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2 + golang.org/x/tools v0.0.0-20191127171310-c1736c0f0a5b gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc - gopkg.in/yaml.v2 v2.2.5 + gopkg.in/yaml.v2 v2.2.7 ) diff --git a/go.sum b/go.sum index c801c5d79..4f5575dd3 100644 --- a/go.sum +++ b/go.sum @@ -160,8 +160,9 @@ github.com/gobuffalo/envy v1.6.12/go.mod h1:qJNrJhKkZpEW0glh5xP2syQHH5kgdmgsKss2 github.com/gobuffalo/envy v1.6.13/go.mod h1:w9DJppgl51JwUFWWd/M/6/otrPtWV3WYMa+NNLunqKA= github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= -github.com/gobuffalo/envy v1.7.1 h1:OQl5ys5MBea7OGCdvPbBJWRgnhC/fGona6QKfvFeau8= github.com/gobuffalo/envy v1.7.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w= +github.com/gobuffalo/envy v1.8.1 h1:RUr68liRvs0TS1D5qdW3mQv2SjAsu1QWMCx1tG4kDjs= +github.com/gobuffalo/envy v1.8.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w= github.com/gobuffalo/events v1.0.3/go.mod h1:Txo8WmqScapa7zimEQIwgiJBvMECMe9gJjsKNPN3uZw= github.com/gobuffalo/events v1.0.7/go.mod h1:z8txf6H9jWhQ5Scr7YPLWg/cgXBRj8Q4uYI+rsVCCSQ= github.com/gobuffalo/events v1.0.8/go.mod h1:A5KyqT1sA+3GJiBE4QKZibse9mtOcI9nw8gGrDdqYGs= @@ -209,8 +210,9 @@ github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598 github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= github.com/gobuffalo/flect v0.1.5/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80= -github.com/gobuffalo/flect v0.1.6 h1:D7KWNRFiCknJKA495/e1BO7oxqf8tbieaLv/ehoZ/+g= github.com/gobuffalo/flect v0.1.6/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80= +github.com/gobuffalo/flect v0.1.7 h1:qQqM2eGdM6tJX8yHKYBM0wVHBLjUT7Qs6uk5jnAhOwI= +github.com/gobuffalo/flect v0.1.7/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80= github.com/gobuffalo/genny v0.0.0-20180924032338-7af3a40f2252/go.mod h1:tUTQOogrr7tAQnhajMSH6rv1BVev34H2sa1xNHMy94g= github.com/gobuffalo/genny v0.0.0-20181003150629-3786a0744c5d/go.mod h1:WAd8HmjMVrnkAZbmfgH5dLBUchsZfqzp/WS5sQz+uTM= github.com/gobuffalo/genny v0.0.0-20181005145118-318a41a134cc/go.mod h1:WAd8HmjMVrnkAZbmfgH5dLBUchsZfqzp/WS5sQz+uTM= @@ -311,8 +313,9 @@ github.com/gobuffalo/logger v0.0.0-20181127160119-5b956e21995c/go.mod h1:+HxKANr github.com/gobuffalo/logger v0.0.0-20190224201004-be78ebfea0fa/go.mod h1:+HxKANrR9VGw9yN3aOAppJKvhO05ctDi63w4mDnKv2U= github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8= github.com/gobuffalo/logger v1.0.0/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs= -github.com/gobuffalo/logger v1.0.1 h1:ZEgyRGgAm4ZAhAO45YXMs5Fp+bzGLESFewzAVBMKuTg= github.com/gobuffalo/logger v1.0.1/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs= +github.com/gobuffalo/logger v1.0.3 h1:YaXOTHNPCvkqqA7w05A4v0k2tCdpr+sgFlgINbQ6gqc= +github.com/gobuffalo/logger v1.0.3/go.mod h1:SoeejUwldiS7ZsyCBphOGURmWdwUFXs0J7TCjEhjKxM= github.com/gobuffalo/makr v1.1.5/go.mod h1:Y+o0btAH1kYAMDJW/TX3+oAXEu0bmSLLoC9mIFxtzOw= github.com/gobuffalo/makr v1.2.0/go.mod h1:SFQUrDtwDpmQ6BxKJqxg0emc4KkNzzvUtAtnHiVK/QQ= github.com/gobuffalo/mapi v1.0.0/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= @@ -333,8 +336,9 @@ github.com/gobuffalo/meta v0.0.0-20190207205153-50a99e08b8cf/go.mod h1:+VGfK9Jm9 github.com/gobuffalo/meta v0.0.0-20190320152240-a5320142224a/go.mod h1:+VGfK9Jm9I7oJyFeJzIT6omCPvrDktzAtpHJKaieugY= github.com/gobuffalo/meta v0.0.0-20190329152330-e161e8a93e3b/go.mod h1:mCRSy5F47tjK8yaIDcJad4oe9fXxY5gLrx3Xx2spK+0= github.com/gobuffalo/meta v0.1.0/go.mod h1:vAgu28tKdaPIkt8j60wYv1dLuJ1UwOmAjZtYOnLJlko= -github.com/gobuffalo/meta v0.2.0 h1:QSDlR2nbGewl0OVL9kqtU8SeKq6zSonrKWB6G3EgADs= github.com/gobuffalo/meta v0.2.0/go.mod h1:KZ9Hk/o+kFpwRhzUO95EOuxf3jXU4GleCTUDSTpe3hQ= +github.com/gobuffalo/meta v0.2.1 h1:6SWsmdlfPC91ysIaPHhXjtVzcAIqUxxC5uetDd4fpdo= +github.com/gobuffalo/meta v0.2.1/go.mod h1:KZ9Hk/o+kFpwRhzUO95EOuxf3jXU4GleCTUDSTpe3hQ= github.com/gobuffalo/mw-basicauth v1.0.3/go.mod h1:dg7+ilMZOKnQFHDefUzUHufNyTswVUviCBgF244C1+0= github.com/gobuffalo/mw-basicauth v1.0.6/go.mod h1:RFyeGeDLZlVgp/eBflqu2eavFqyv0j0fVVP87WPYFwY= github.com/gobuffalo/mw-basicauth v1.0.7/go.mod h1:xJ9/OSiOWl+kZkjaSun62srODr3Cx8OB4AKr+G4FlS4= @@ -651,7 +655,6 @@ github.com/markbates/going v1.0.3/go.mod h1:fQiT6v6yQar9UD6bd/D4Z5Afbk9J6BBVBtLi github.com/markbates/grift v1.0.4/go.mod h1:wbmtW74veyx+cgfwFhlnnMWqhoz55rnHR47oMXzsyVs= github.com/markbates/grift v1.0.5/go.mod h1:EHmVIjOQoj/OOBDzlZ8RW0ZkvOtQ4xRHjrPvmfoiFaU= github.com/markbates/grift v1.0.6/go.mod h1:2AUYA/+pODhwonRbYwsltPVPIztBzw5nIJEGiWgKMPM= -github.com/markbates/grift v1.1.0 h1:DsljFKUSK1ELpU22ZE+Gi93jiQI3cYD/RQ+vHM/PpY8= github.com/markbates/grift v1.1.0/go.mod h1:8N7ybWEcnMOvtSb0kW+dLJpYii9eq/FP3Gtu/cNPDTY= github.com/markbates/grift v1.5.0 h1:CZyK0k+8BdhQMgbwzuKMysC12y4tf9H004jAs/FutX4= github.com/markbates/grift v1.5.0/go.mod h1:1ssFm5gSGmzTkhi3Wfh/nqlU74J73TlAjoDMttQbpfY= @@ -884,8 +887,9 @@ golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaE golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c h1:/nJuwDLoL/zrqY6gf57vxC+Pi+pZ8bfhpPkicO5H7W4= +golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1049,8 +1053,8 @@ golang.org/x/tools v0.0.0-20190906203814-12febf440ab1/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191015150414-f936694f27bf/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2 h1:EtTFh6h4SAKemS+CURDMTDIANuduG5zKEXShyy18bGA= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191127171310-c1736c0f0a5b h1:YOPm2ECOnQ8d6CJ6RbKWtMaO0cbC+S9l0x4MlK7IEwI= +golang.org/x/tools v0.0.0-20191127171310-c1736c0f0a5b/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc= @@ -1097,8 +1101,8 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5 h1:ymVxjfMaHvXD8RqPRmzHHsB3VvucivSkIAvJFDI5O3c= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo= +gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/it.sh b/it.sh deleted file mode 100644 index e3e6e254f..000000000 --- a/it.sh +++ /dev/null @@ -1,129 +0,0 @@ -#!/bin/bash - -set -ex - -# git branch --set-upstream-to=origin/$TRAVIS_BRANCH $TRAVIS_BRANCH -BP=$GOPATH/src/github.com/gobuffalo/buffalo - -export GO111MODULE=on - -go get github.com/markbates/filetest - -make install -buffalo version -go test -tags "sqlite integration_test" -race ./... - -cd $GOPATH/src/ - -# START: tests bins are built with tags properly -mkdir -p $GOPATH/src/github.com/markbates -cd $GOPATH/src/github.com/markbates -buffalo new --skip-webpack coke --db-type=sqlite3 -cd $GOPATH/src/github.com/markbates/coke -buffalo db create -a -d -buffalo g resource widget name -buffalo b -# works fine: -./bin/coke migrate -rm -rfv $GOPATH/src/github.com/markbates/coke -# :END - -cd $GOPATH/src/ - -buffalo new --db-type=sqlite3 hello_world --ci-provider=travis -cd ./hello_world - -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/new_travis.json - -go vet ./... -buffalo db create -a -buffalo db migrate -e test -buffalo test -race - -buffalo g resource admins --skip-model -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/resource_skip_model.json -rm actions/admins_test.go - -buffalo test -race -buffalo build -static - -buffalo g resource users name:text email:text -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/resource_model_migration.json - -buffalo g resource admins --use-model users -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/resource_use_model.json - -rm actions/admins_test.go -rm models/user_test.go -rm models/user.go -rm actions/users_test.go -rm -rv templates/users - -buffalo g resource ouch -buffalo d resource -y ouch -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/destroy_resource_all.json - -buffalo db g model ouch -buffalo db d model -y ouch -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/destroy_model_all.json - -buffalo g actions ouch build edit -buffalo d action -y ouch -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/destroy_action_all.json - -buffalo g mailer ouch -buffalo d mailer -y ouch -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/destroy_mailer_all.json - -buffalo g actions comments show edit -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/generate_action_all.json - -buffalo g actions comments destroy -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/generate_action_existing.json - -buffalo g resource cars -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/generate_resource_plural.json - -buffalo g resource admin/planes -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/generate_resource_nested_web.json - -buffalo g resource admin/users --name=AdminUser -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/generate_resource_nested_model_name_web.json - -buffalo g actions users create --skip-template -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/generate_action_skip_template.json - -buffalo g actions users update --skip-template --method POST -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/generate_action_with_method.json - -cd $GOPATH/src -buffalo new --api apiapp -cd ./apiapp -buffalo build -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/apiapp.json - -buffalo g task plainTask -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/generate_plain_task.json - -buffalo g task nested:task:now -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/generate_nested_task.json - -buffalo g resource admin/planes -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/generate_resource_nested_api.json - -buffalo g resource admin/users --name=AdminUser -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/generate_resource_nested_model_name_api.json - -buffalo g resource person -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/generate_resource_irregular.json - -buffalo g resource person_event -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/generate_underscore.json - -buffalo g mailer welcome_email -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/generate_mailer.json - -rm -rf bin -buffalo build -k -e -filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/no_assets_build.json - diff --git a/options.go b/options.go index 9a7e62a43..244d9fd27 100644 --- a/options.go +++ b/options.go @@ -162,9 +162,12 @@ func optionsWithDefaults(opts Options) Options { } cookieStore := sessions.NewCookieStore([]byte(secret)) + //Cookie secure attributes, see: https://www.owasp.org/index.php/Testing_for_cookies_attributes_(OTG-SESS-002) cookieStore.Options.HttpOnly = true - cookieStore.Options.Secure = true + if opts.Env == "production" { + cookieStore.Options.Secure = true + } opts.SessionStore = cookieStore } diff --git a/packrd/packed-packr.go b/packrd/packed-packr.go index 87c0a43c3..dab1d4040 100644 --- a/packrd/packed-packr.go +++ b/packrd/packed-packr.go @@ -29,10 +29,12 @@ var _ = func() error { "249b50674fa80d5d2389e61231cdbc08": "1f8b08000000000000ff2cc74d0a84300c06d0f5e41421ab7163cf9496fea16d827ebdbf20ae1ecf351d5a336b42b77913f5e17681ffc4cc2c332334c0e52dfda476b415f76423548bab143d2d7c0a6df4040000ffff73c1922350000000", "2b101e95a5f58f9db6a47dae28e04166": "1f8b08000000000000ff7c52cd8a1b3d10bcfb29fa1318fc416686dc72900cf9bb267b302c3985b6a667d56b8d24a4f62c8ef1bb87b16cafc3929c24d155d5adaad6ff7df9fe79f3e3e12b3819fd7aa1eb01a01d613f5f00f44882107024a326a69714b328b031080531ea857b71a6a7892d35e7c73be0c0c2e89b62d19379afee85acc35c488cdacbd07cb89684c5d3fad37e18d04768e07884362629edc794da6f3852bb9911fc8be074d25d852f008ec706788010e50effc8e21e699bd0eee074aa0d96068a1c3c1547241b7c5aa96d6dd6da52d4ffb0bcaa51e8ff41c2943c5b148ee19ef8a74bb6e4a1499871bcf309f7e228085b96c34f893b0a0ababf702fe51b771ee42d1f96eb5709cf610799bc516c6350e0320d176229240f286ea578c4272add80d30c6ad9c6f307ce21e8ee1ab9dec6feb05e54dd9e27b01e4b316a1e073950be84560d4a98e7ac576af0585c3b2fd0ab2b157260f2fdcda8aee7e9aabe34f08c13169b39bd35f8f9e6afeeea4cbaab0bfa3b0000ffff85cad3beb8020000", "380ebe4d9806da77bde6826811c711a7": "1f8b08000000000000ff84524d6bdc3010bdeb573c9425b40549ec2d98f4104ad99e9a3d945e83ac9d95c56a2da18fa590e6bf17c96e9a26949e9e791f339e678f740c891eb2492e968101027e86c8506375fe90a16c503919b57947660ae08f8f32c492e55d8c72afcd495bda9fecd313c74f985a200ee08a431cb7effb3473781ef1af68f79d4f07972022621dbd334ae74c2577c906582a1015d695a98ed284b3b261acc7a3f641bdc2bf2205e202a9a4949da61f31a482fdddb72f1ff9a6c1b0d9dd3754a39b3963b9684b79e9a1502e8cc906e2a2531e70fdfccc808b4e4e8f7e7103bbfb87cf5fbf0fe0cdc319bbc22e783d5b5c286517669829384398c8474a4cd64cc2768770676d69c0f50bcaebbe1d58b5851e56fa7fe9adb87913ddca1bc65ababdee153e4d7ab68412c06f6f077c78b39b37ad664299080b855df87d0d035ec796a59d7d59536f74c07ace9fffac35bc7eb145fc150000ffff696b81d58a020000", + "39754c543c1763e08ceca1b55ee96d20": "1f8b08000000000000ffec56cb6edb3a105d4b5f31108c403274e9bd812c7283b4c8a2818124dd14454289639bae442a24e55625f8ef855e7eca69bd68b2e92ae4701e67ce1c655cd0f41b5d20584b64613499b577e77c9fe785540642dfdaff4051b1401871985e02c925c38cdc36ef1a9cf3bdc0da11772e687c51b0da581ff9bcf7fe4c33cea8e15274110b6e96654252994f163229e7739ac9c9baf5c2fe2095decb19f97d5a7c815197fa46a49271b120f74671b18060a5a5a0050f9cf34d5534cdb59e7734473253b240e51c68a3cad480dd6d90360d36545c19a31aac0000d68e68174e754a33fe139d6bad1fe54355d4b7e7aeee34b0b687d8053d0a864aa752e1062467013857289e5355590b986904e7a831aabe35fdc6dbb2db0cce05c092bac8e0dbf3e10cbac46f4b85b587d371ee24e4f3da698fcef72713e8c8e41a8434a0f0a5e40a19241514b2002a18e4b4820481618606993f2f450ae13e0bd74baa9a0e86a889ba1a6154935417b3674ad05b5305aba40bd7e4ff92670c95ef3dc125747ee413557a49b319ad32495978b14a62b8188219f99e42532a01ab84f4d0f6e6ec6dc236a8dad0a174313cd5633e0a71ae873448d61645db55784ecde8788e43dc935956aa5e5e7f3ee19332dfcbf7e5ebf0b8df4455bb48fee9eb2df4d56d1f84051a0daa14806b5415189e2354b28494661950080a59f4ab0ac70184bbf72bc1eee91a6338305e2ba4e6d8fc58d4870872344bc9480de361c975773f52d7b1acc86bba1a9ffa77d52308cd0f18d790aea51098d69b378270dc6f5872a394543a06acff465bd59dd8d7dd3836e19b32bee71d2d8de114dec576ab136b535a70d37c05101ac5f3a7feb7c8669144ceddea99428dc2d80f1c333685ed62d961830ceea4186acb1482c1d7c0c51d7414ac8617c52078b62ff5c3aeeff07bcb5bb8eb3da4b45614afeb2d181452f05e8a69cb9fad9bdf93b4cf4cfb5d9cc74c1bf36eccb4e5ff0a33bf020000ffffdbf0e977810b0000", "3dc49c126d9ae937cfa7f3b28cd6695d": "1f8b08000000000000ff548fcb6dc3301044ef530a01ef36910e5c80409313890ec555b8348d741f08f900bebdc300efcd64cbd6152168906aeb0ff8672d8390921915b7d214633f14cd3297ddf2a3d215e2d1fd9262daa8089723a68f2eabe178dc6a491add39ced9f464990a597b791fec0a619ba749deaecb755827821c2523d9648f2bff41721c11e2b3419235b7ca652b3eac7fbde803e4be3dff5aeedb530282f819b23320171f8a958d3d0ee6b3e9f737be030000ffffcfa015bc01010000", "4458f74dae2e5b725e2ccf002ce9ed98": "1f8b08000000000000ff7492c18edb201086cfcc534c39d99585db957ab19443ab6ebb87dd4d14a7eab1621deca0624018278da2bc7b35d8de5372b060f0c7fcffcce065f357760a7ba98d0a0380eebd0b113360dcb88e0330dee97818df44e3fab2736f63db4ae3ca650dcaee55e0f730658fe7bb3f493c94c787bbc0b2923b0e39c051061cfae8935f5127ed7418f0e3e4443cda4e5b05d08eb6416d75cc72bc00b0b2c4cd688cb61d36ceb6bac336b81ee341a1b247012cd55dad283a8b9f2a66bc7ed96dfe6cd6db1d2f907ffef4f085e7c00e6eb8853dadeb8419d748430cb1e3a0c20df657fdb82596102f87e1e4c2fe96f2d7bafebdde7e9f516054a80ae973011835a24807aba91fafea4417a7b66464a240aaaa403252e0a245b9749b6e7e58a1d5062fc098719df821a334990a2107760560947aeeebab3a65f376eda37676b80022e2d3eee5f9599edd182be4266dc421f68617c0d84ef5dec8a8866fee5f8569de291197de57f39babe20251a14294eff134f7bc987494f1442f7ee6f8722d805d73b8c2ff000000ffff685bab16cb020000", "462c7c76f198fdd0129ec42ee775d844": "1f8b08000000000000ffbc92414b03311085effb2b1e2b85f552a878743d78d793b7b2946967acc126914cc2e2bf9760060b2a56058f99f95ee6bd4cd66bdd49a0e4e2347581bc60447f8859111f303bde4bd6beeb80777099697b9069ea00c024c7e8477899e2dc0480e32ab85a8c28c5f11d79e1a1e9fb732caefbc6d9d5f78f4ee1b4b9c1d9ca806de4970a68f462dd5ab3fe2e0965e10d651b18e23c1c8f28cffc25f1d320c329de2ffecdfb37fb2a2ae917dbfa34e42da527dc5016b50eb1770123722a62a57d652f57edf8167973ea5ff8e373bc060000fffff48dcecee6020000", "46725fddc2f766f41002e82e0f237bb5": "1f8b08000000000000ff010000ffff0000000000000000", + "488d28d4dbee30fe1302b78f21e750a1": "1f8b08000000000000ffac94516b1b490cc7dffd29747b70249038073e8e63215cdd26d0408883ed50fae41defcaf6d0d9d146a3716a8cbf7bd1aebdb6d3bad0d0079b5ded48fa4b3f692e2f2f3b052ed15155a297b4035058e330971492d2b035c53451a3113335015348d6eb2e5512ba8f8c33fb75b3991cf8ebd105057576941ba7cf6aab88d5d6ebfdfdafbec6809c42c244cd5713c20b71d19a3a82e1b4963ff5079f29426ebcc60203c1fab943781ade4310b67e0e33629005423025424e7e66e7918d58f2e92e4664a79157e1d9a557579a3ad5bf7767adf654159f5f7d57b2eafbbf321c706c4bbc168ef857199dd8911841ed44688c8ca6d02314e5ba17f6ea1f4810646104ec0c5614eb32b2c82ebb009205f2b1e40086118275e8c5adc0ce3d3116dd3ad49d0759d800b909785197ac5d2863108d21c67a30ce01e373b48c851a3de61a152ac3a644410eddadb29f71d6a27f17e08aa988f9118d96a87181ea7ea05f5a26afed340e963a01538701848096c86c0b84a5711103d85d13eaae758f08afd7c97a9d6c36e8970386e4a63feebfef8f6e274fc3fbe46df8f7eadf32049bcdaed9bfba69fbbc7b0ea7aafb38188d93434a75da86d3299fc7c1507d6a8af5f186e3c9068e6e87c9166913bde57c32437f34fa3418de1cb935f8fbbea837a11d8196f10f2716a62b0828a2bb6e05a22f9081aa7a5b5afedbf77ac654de96550acaa531be2276f8e9805b0abdd0187372aeb946208932fbaf9cfe3399a347366e92dbfd867fe83f8def060f7f345e90b5c93330bec85ee7cd9a8d9da216a5139ea98e4c9f5e88bf40c55421bb55771befaeb936f45af0241022e3051454bfe40be3e70867c41aec5cef84b0db946ee75b000000ffffd22b0ceef3050000", "50f60207eb74d1b7f2b9b07fa815c278": "1f8b08000000000000ffecd1416b32311006e0fbfe8a21dfd945053f616fb215040b915d4be9496232c5c5b8b364a26d59f2df4b2c6a0f655bbc095e873c7933797bbd5e62f080969a1dd63e4b004ca52c6a9f8126bd75a4f4260e95576bc59841dba6d4784e170e5fabf71056df7802b021f6f190685b1102607d900e442ef3792127f96c3593e55280180cc7693feda70301104202d090eb740b594437fc3f1c8d4f66cfe8bacc53392d040847e4cf318af98d9ce98c9a94e5b32c1e0488cbebc866304a00a8f115d51c3f0a80d9eec86006a662b5b6781cfe63b6315263f74665f9b82aa45ce6d3e366a7a8af0bfe827f845bfcf8cdcda72f679678e4ab5a8fee5ef7cdd5dd38327b1d77baa6f48bbe577f6bd57f060000ffff849b5ab1ea050000", "5326a1f49e88f03a1e5f2c3a40e54348": "1f8b08000000000000ffac94516b1b490cc7dffd29747b70249038073e8e63215cdd26d0408883ed50fae41defcaf6d0d9d146a3716a8cbf7bd1aebdb6d3bad0d0079b5ded48fa4b3f692e2f2f3b052ed15155a297b4035058e33097149272159e5da22623666a02a690acd75daa24741f1967f6eb663339f0d6a30b0aeaea28374e9fd55611abadd7fbfb5f7d8d01398584899aaf268417e2a2357504c329257fea0f3e5384dc788d040682f57387f034bc87206cfd1c66c4200b84604a849cfcccce231bb1e4d35d8cc86e1737bdbad2c4a9febd3b6b95a7aaf7fceabb8255ddff95e180635be2b570c4bfcae8c48ec4086a1f42636434851ea128d7bdb057ff4082200b236067b0a25897914576d905902c908f2507308c10ac432f6e0576ee89b1e8d6a1ee3cc8c206c84dc08bba64ed421983680c31d683710e189fa3652cd4e831d7a8501936250a72e86e95fd8cb216fdbbf0564c45cc8f68b4448d0b54f703fdd232796da771b0346ccdd4610021a02532db0261695cc40076d784ba6bdd23c2eb75b25e279b0dfae58021b9e98ffbeffba3dbc9d3f03e791bfebdfab70cc166b36bf6af6dd93eeb9ec2a9da3e0e46e3e490519db4a174cae77130549f9a617dbca178b27da3db61b205da446f299fccd01f8d3e0d8637476e0dfcbe2fea3d6807a025fcc37985e90a028ae8a65b81e80b64a0aade9596fef6bd9e3095b725958252698caf781d7e3aa096422f34c69c9c6b2e1148a2ccfe2ba7ff4ce6e8918d9be476bfdf1ffa4fe3bbc1c31f8d17646df20c8c2fb2d779b3665fa7a845e97c67aa23d3a717e22f503155c86ed5ddc6bb6b2e0dbd143c0984c8780105d52ff9c2f839c219b1063bd71b21ecf6a4dbf9160000fffff8e8761fed050000", "53cc1d15028e0b1431c355d61ba109d4": "1f8b08000000000000ff648ec14ec2401086ef7d8a3ff4a209e9039870a8b2310605d2ad282732b453d8b8ec34bbdb62dfde948428718ef3ff33df97a23c9a808c5d8fc658c699020eecd853e41afb01fbae69c8ca1454d738b267c42363ecf7e40ded2d070cd2c131d748d26b1f5160856a1817e572a2961b8803b5ad351545230e21928f5d8b20e30b7f939dc57f0554e23d57d10e5992a2948bc42fb70b8c85dace36f9ebbb4223fe44717ab1a9c8c152640fcfd11bee476d1360dc3fd2e83ca00bc61d20217be6c8aebf9b2cd476729f256992427dd3a9b5fc90a498e765fe986bb55be75a7fac8af9ecf33a490aadb47e592d775a3d15aabc8ddecaf54eab62a38a3ffb9f000000ffffb53849697f010000", @@ -46,6 +48,7 @@ var _ = func() error { "6636bf271e9c01d1d5f067708b9de426": "1f8b08000000000000ff8cd0c16af3300cc0f17b9e42080229a429bd86341f1f85ddd6055a765763b53673eca0382dc5f8dd470adbd86d275dfe483fd4287383ded234ed70a42baf359362c1360368f4b63df01d62acfc18a6ead52bb655277e6449a9d9e86d9b351b656e6d9635f90e2e5e86172fc5effe9d644f131f8dbb5a4ea984487d30ded5df7b0f34f057d6d959c8a6d451d0c5aa848183f6aa06ecde8e274c2b88903f6df90e469260c816186375f1562daacd82a874182cae7e4a6bdcc7c9177f39189fcfa801cfc1c139b8f59dc41977c5125051a075efddc5c88035e07f6178f819a659f81f9670f6ea5103eec9f56c176cde664d0e69999f010000ffff061f56f169010000", "69effaf8141ec967d8eaec8fe3a77d60": "1f8b08000000000000ff8c565d73e2b8127de757f475a50a3bd7d855f7d153dc79c8a6a6766b2699dd9dd979002a11761b448ce451cb4e18e0bf6fc9923f80646779c020f539ddea6e9f562a0569f886cb92a54f300585df2baed0f79eed9217bc1b599b0f855c0e0d56855cf6bb37b2dc3996cf45b5e262689aca7237718493b2d9ee919fb8e03744b72f5ab1545f82b75cf0494a34416b7149c004cf915e81b62eb7cee2027a532013f74b92056abc5957e28906f8718b4f8dd9443abb49da188e3b96afab82e7bbdfe83280aad9d9d09b87ffc86bfc030bc9b20b70e7bde035aac6c6c18d67874fa5c8f9aa524c4b0553d88f005068c59112c82b916a2e851f9865809aa976d3999a0f2bcb82a7cc182630738b00e3281632c387adccaa0229de7caf50ed26d586625269ac182f28dad0381c2218116a8a53a278401b514abde1c2fe388e9a8769aa887622f5bd0e7e1d5f47d75e10e552ddb274edfb26e85d00d3ff7741f31cec2a4ca7d39f790e3a1880425d29e1feba18000ad4f0843b9836f9d9450acb82a5e8c7fe3c9a3bee79ec934a0f1b3aa44487950ce671709847be26b34633962eec7abc0a613c0eba48fd27dc45a499d2f48debb5ef3d78011c0ee0c797d8ab98079146d2dd99a790b382f0e767e0b9df5677f684bb85818aaa2886c8d37d98354e163f211e82a2b2a2b58bcd96d13e2cb2351d011c4303b7ed4a7e1b83e940b766dc3b07029f5b018a3e2b59f30cedcbe0efaf12f06ce779e1e677f3ec178e413820784d45fc7dce0b146c8b097833f35c44b3540a8d42af19ad17514a74c673a163fe6c9f2bb94da06b502fd43201cf3b2e42d81b69fb2ab632e339c72c01ad2a0cf94a488509cc3cd390d7d75e08dea6fd615e9feb6b6f01a78edb0c7c942c43755f9afea5f61c4603b7fc073afe0c97d52ab19d719686132db409b8b309684530da9014e7a7bed441df5676f16e34acb0ab5e57612b0f2edaa1e4b88a3b58db82ca68c95066fade04307d9f403c8fdc0b71158783dd8a7008349fd76a1e154dfec213c33dd8d5044c4126f68f17826ce3de93ac548a9f5869337c3cbe4940ec5f320c08fa576cc0bbef0face9e5fd551cda337a7ac08f2f69516598c0a91abf4eb3b1345da84bb6c4a2e37a83ea8d90fc6799e707f3f5bf83d6f981ea55e0cfdfd7d379f6df79d47e05c69f8dba529dabd71951ea7f2430adda32bc16949b8b914292458d7eab0381c3e34b29a965786fd5e23fa78b576f84b6927df657b25ca3da743568ebb87063abedfc65c58beca619bf97a3368ee1eefecb6d02bfe6b093153085b06635172be04415123c73bd06bde604426a58a2d922d4e0954a96a88a9d17c2963d614b47954243a5e0c3fdc3eddd5fc0a9b16fcd81113c2eab3c6785b4b13d82ac51299e21c1ddfd2fb706d5b235de9fd74c638de78c5a8254e065586321cb2d0aed450dcede3850d430356e53248a50d4514b6e86da09cc4987517d7b4f195c3bb6d2b4228a3a1c8c995d7272a189dc3cf13bad92952e2b9dc06bc26e157d435e0825d3eb041eaff60f0f195766ff1897d5b2e0a993f0c7ae0f9ca09d39ee0657d8875b15786675227ebdad6bd06438785f340ab24a311b479ac6218c9beb53f39062bce8c62ef4c3d7cef4bab9e49c64168296db06d4066ce7b351f4f38ba5bf67658922fb3355bcd45fd8cac954107451374a6df98641d8b23737598ee69269e84fafbc7e1b8dbdef76e3a04fc01259a579be7343ab7f0bb74cac4c62f74f88e5436e6a452eb4dea82b7b2ab7e6fcd4cebede2495db522119a7c7d35406dd314ca28c606ff98fe67a386c4737605502b3f6a88b6116ced3731c1d4723db00911119a5cd95e6a43d060ae107a3bf030000ffff73bc7cc3690d0000", "6b9404501bcb97dedc55c936193973c7": "1f8b08000000000000ffbc544d6fdb300cbde757104633a4401da3d74cf15034c150602b82ade85d899858982c1912dd2c13f4df07f92389b734b7ed628916f5f8f8449209f9061bc59d9b2715df615a201768937c04c08afbdcfba9a9c84dbf1a816afad99aba0a8165c57d3e6299906ff988d5aa0750d2515a6b470785021a4b6a2535b6704ac605808de7a0a4fef162261af77d84675ee2f41b3a53db0d86b0e2544c6eefc037d83348d6a4614d3aadac2cb93d24e1163c8c5b4480478b9c109e710f43ca2b6b2ab421749121b4775816d9b0ac56f968c488af15f659b446f34d1d5959a168f953d426eebc07cbf50ee1a682d91cda700f44d641da45f21ee4167474993e9ab234fae5502124843f29397a312a72efa34f93fd8abb0d57f21742d4988abc87422dba3b03a305f8a0d7aefad8fbc7b5a3c9686dc4e1a4f9d658980cd579e5f6913bfc2ef54e6108b720355cf458a9da7215c2b9e68c6cbf3d2952be2bc95096f29a2e2dbac8236bef6fae309e7a1fa186f285f8c82c23919f073ed7edc28f36e2d10018b446ad546ae5aea0e4dc6550cb8342fe836653cd1e062e2b6e79f9b408617659f2638a4f0b08973a41eaad49ee203ef20c925789fbd814e37709a2903464d0f5c63f61b7e7564bbd3b115c0a49d709fe770545ac599bdc412238f1b4442a8c4866902c965f962fcbe3c1c6e8adb4653c79b008075383ab2d7e3a25b74047d61cfecaaf1b9227f354632cebfbe77c2c753dcbb26600c5e1745686b14bd20d6aea27f4780e15df49cdc9d849b793463724bad0bf030000ffff7c6741bce2050000", + "6d24479674fa9f18b2c966c41ec7ff32": "1f8b08000000000000ff2cca3b0ec2301006e19a3dc5e22aa1d86350a214e991897f82855fb297caf2dd5104edcc57ecf6b63bb877c9459bac68bafcda18443e965c958da2a94fbb217a7ed2c687baf72e313b04b9d908596a2ea8634cca97bf9675e64e2795ab551b26b3be7ce3e371025c63cdfc00fb58022292c29dcd4c83be010000fffffc832c0893000000", "709da3f0db2b11326f25fd99c4035c2e": "1f8b08000000000000ff74903d6b342114856befafb8afc58b2e83032917b6d866cb14c942cae08ace4a6655f49a0fc2fcf7e038c51248a93ecf390793366f7ab2a80df9180a80bfa5980905304eb6900f1307607cf274ad1765e26d9ce2a53aa7e73836398fef0ffc2fa0544f968304a0af64f1b8963cb74b2c94ab21fc06b65b29d51f61017035183cdb42af778220dc6d83d45936af4f1ed0e68cfb03f69447fbd1a5174fd793ffa49a6d11c794841c70dddb10c17fc7f301b952a3db0c2e2530efd6ec7f070c7e6e8d8cd449939e85cd59025b00982eadfbff5d52e3fa71bffdead050d6f73dd52068405d242cf0130000ffff7b2fce9c7d010000", "72751874ad9edbf6b806613c6e298ddd": "1f8b08000000000000ff9454c16edb3a10bceb2b064c60bc57801272281008e9c1a95df790c6aeadb4e849a0e4354d84161592321ab8faf74292e5c449d3a4a715863b332277c88c56c652ea72ab4a1f07bb1d875a81ee109ad2bb707499dc9704561ae7a525c750d701c0214acf257954e55278c260704054e1bcd01afc1e3deb4ef35c2b2a7cab4fdad11f4d36f7ee4eff9b434b39122f96bd802ec01da2ac527ae9104913399b47a7ff51be3660bb5d673e2ccb7026f25b2169762beb9ae117f2ca832fc12206be3afbbf55cb97078997a86ddfe676a92c7889b2cab4ca23e11c79d72e4983e6f77905a9fcbacac2dc6c2269b26ab512da444fea11c5836f11466118b630fd2c8df5980d93cf1fd86953e2d3c9b4a951a60a1604ce0b492e6e9b3d391f046153f85658176370f80e80adb04a64baeb0626d3747cfd2d066b7ad85b0301cca68b64321f2fd2d1657c7cbad76243e127a5a9aed307d137a500f8f263f1f52a1d0d93e1e570317e55f981329f4e9374365c2cbe4fe7a318cc1ad33bf7110192f1223988a737f3abcea0d11a653756d7350b82134c8c1685c496ac53a640be362a27ac49976483b072c465dbc1d546488a31780469d19e3fb05febe0780fbfc63ee3e7cfa867e1791034ec666027f8b81685247803767111e3dd336fd6ac558ee0d7840ec2c4f4bb0980a7b4ceb4451f07a5cd548cfd761cd9adca9bd4bc1491e341f2eeaec6efff3efd67b9e28757a43fb3a319f60f57d7babf3add3ffe0e0000ffff943495a3db040000", "73ebe94c550be297aea1d1d45640408d": "1f8b08000000000000ff8456dd6edbb812bed7530c74651b0e756f200572dab43907ae63543ecd0245d130e2d8e296e27049ca8e61e8dd174349891d20bb178664f29bff996fe464f55bee10641535d99065ba71e4234c32807ca763dd3e898a9a62474fed762b0d1568f7c7fcdddbe1c9802df90a4330ef209bc3d58860b4935e3686763bf4ef0b9c81debad05a4fc6a02a0256adc73ccb004e27d05b10e4621037ce89071deb3539e83a163e9d5e6fbe924213d6bf775df7afb15d3972c5f06b0e796f07ad82abaecbde08fb5054e4c3fb3a9f8b802170ea1953918d68633c3a7c3f0967a03c9b665951c0edea3be8006d400591a046e3201c74ac6a0818a3b6bb004f926fc9c2a1468f106b6449e99cd195e4e2b38627d47607beb5023ee156b626f269ae708f865c8336e622db4b9f2c5e03f782f88271927fb9ff75bbfa9ecf2fb1d38495cec16c0880b39d5cbe718e55f7ce4863c0531b3180b40a1aad94c183f4c84d0483284b859a5aa3e00941e1565b540236b50eac29d60816fd1ea1421bd1036de148ad7f13a5c88a828fbe51cb79999f199bc3ce53ebc21c3056420860071456467a54b0b95fc3d507f874ffb0621dbddd06a50ddc64476a412a05f2dcf948f0289d7b8499dc46f4b34119a758b28a646e0eb196b17f8783360656f71ba8e51efb0b8b87339d1c2f42904daa1e87ed5be4503d066a7d353a9c620d20031cd09831e8ff469026d0e076523fa6dd23543556bf5181b62999e4157a7e3b5e242205ff5872a63f6b83e191bd90f0f166f3f1eeea66b9ec35ce2110e838164c9a833c727bb1b033b24205468638da4a3217aecfd9771dfb8c388f7bb4a3b3ace3a52c29b30c8c0416f7e8b9392ac95420b26d6b2beeb4c9f4a201e19401178d1bf3fa1aac36e904fa83b1dfc40a0f93f1fdde25af7a18c0addd2f7806e6c3ffb21fe23292c7058c232d56ad31a76e04ad3d3e488f61013f7e8e7a87b3512f53800f6298bdc954dc49ab0cfa5145f7c6e04a36b880fcd73997f199e0d274ddafc193bc17eba6597af2f8b5911a193567ea081e95f658a52496e572cc85f87fc04922e9b25c4ea6afd24bda81c7bf5a0cb1276e8ce8034cb6daa4179eb7e3545ce839e36eb11e6596e9ffabe21263df0f83f281eb20316224f85f79bfbad07a4686a264223a1bf5e2cf40361fddfec765908c3f78e902a0acea17fbda8284e8a50dfd821423162af15d9a1627797ccea7623273e4c447b216136e3ae2be6143fbe4bad2413e191e6a1dde6486f788d8bc5a9934691d894fff994e47df79c1f4fba517fc72bb99e4453e873b6a70e812062788c7d87acbb8ac4b6c3b16b11fa7f1fa82ab980c86dba119a4056d2b6ad24ae813924867cbe3a603588a70b7d9ac4b01791da35b14053ecbc619e4a595c3f587fe3cbcb938a3cf57fb8a30c06c6629ce668036a5aa2c97226d00e6f10b12870d81a2e4342b3b70c754d4349ca536248205e7e9f9b880d183971d2a347fc4148aaa5024cc902068c82368bb25df242b67b2ef7e67143dc7bc0ec90b7b7c7d89ed33234eaf65193f7bce20935edb25cd94e5f2db508b45cf3abc74af21779e549b3a6518ecb25cae39923b940a7d584023dd8f1079d3fcec1fa7fc8fabcfe40fd22b54576b4f91f2c5509e3cb14a37cdbaecef000000ffff2bd1c1610f0a0000", @@ -287,9 +290,17 @@ var _ = func() error { }() + func() { + b := packr.New("github.com/gobuffalo/pop/genny/model/templates", "../model/templates") + b.SetResolver("-path-/-name-.go.tmpl", packr.Pointer{ForwardBox: gk, ForwardPath: "39754c543c1763e08ceca1b55ee96d20"}) + b.SetResolver("-path-/-name-_test.go.tmpl", packr.Pointer{ForwardBox: gk, ForwardPath: "6d24479674fa9f18b2c966c41ec7ff32"}) + }() + + func() { b := packr.New("pop:genny:config", "../config/templates") b.SetResolver("cockroach.yml.tmpl", packr.Pointer{ForwardBox: gk, ForwardPath: "50f60207eb74d1b7f2b9b07fa815c278"}) + b.SetResolver("mariadb.yml.tmpl", packr.Pointer{ForwardBox: gk, ForwardPath: "488d28d4dbee30fe1302b78f21e750a1"}) b.SetResolver("mysql.yml.tmpl", packr.Pointer{ForwardBox: gk, ForwardPath: "5326a1f49e88f03a1e5f2c3a40e54348"}) b.SetResolver("postgres.yml.tmpl", packr.Pointer{ForwardBox: gk, ForwardPath: "e2475e65981b98fa738efc3c4b639c69"}) b.SetResolver("sqlite3.yml.tmpl", packr.Pointer{ForwardBox: gk, ForwardPath: "fb34aa975abbcb40d48be167668d4187"}) diff --git a/runtime/version.go b/runtime/version.go index 421206ec2..f433a7232 100644 --- a/runtime/version.go +++ b/runtime/version.go @@ -1,4 +1,4 @@ package runtime // Version is the current version of the buffalo binary -const Version = "v0.15.1" +var Version = "development"