Merge pull request #295 from gochigo/version2-only

made master branch to be v2 and updated dependencies

.github/workflows/tests.yml

@@ -1,27 +1,19 @@
 name: Tests
 on: [push, pull_request]
 jobs:
-
  tests:
  name: ${{matrix.go-version}} ${{matrix.os}}
  runs-on: ${{ matrix.os }}
  strategy:
  matrix:
- go-version: [1.12.x, 1.13.x]
+ go-version: [1.16.x, 1.17.x]
  os: [macos-latest, windows-latest, ubuntu-latest]
  steps:
  - name: Checkout Code
- uses: actions/checkout@v1
+ uses: actions/checkout@v2
  with:
  fetch-depth: 1
- - name: Test v1
+ - name: Test
  run: |
- go get -t -v ./...
  go test -race ./...
- go install -v ./packr
- - name: Test v2
- run: |
- cd v2
- go get -t -v ./...
- go test -race ./...
- go install -v ./packr2
+ go install -v ./packr2

.goreleaser.yml

@@ -7,10 +7,19 @@ builds:
  - darwin
  - linux
  - windows
+ goarch:
+ - ppc64le
+ - 386
+ - amd64
  env:
  - CGO_ENABLED=0
- main: ./packr/main.go
- binary: packr
+ ignore:
+ - goos: darwin
+ goarch: ppc64le
+ - goos: windows
+ goarch: ppc64le
+ main: ./packr2/main.go
+ binary: packr2
 
 checksum:
  name_template: 'checksums.txt'
@@ -25,8 +34,9 @@ changelog:
  - '^docs:'
  - '^test:'
 
-brew:
- github:
- owner: gobuffalo
- name: homebrew-tap
+brews:
+ -
+ github:
+ owner: gobuffalo
+ name: homebrew-tap
 

.goreleaser.yml.plush

@@ -4,10 +4,19 @@ builds:
  - darwin
  - linux
  - windows
+ goarch:
+ - ppc64le
+ - 386
+ - amd64
  env:
  - CGO_ENABLED=0
- main: ./packr/main.go
- binary: packr
+ ignore:
+ - goos: darwin
+ goarch: ppc64le
+ - goos: windows
+ goarch: ppc64le
+ main: ./packr2/main.go
+ binary: packr2
 
 checksum:
  name_template: 'checksums.txt'
@@ -22,8 +31,9 @@ changelog:
  - '^docs:'
  - '^test:'
 <%= if (brew) { %>
-brew:
- github:
- owner: gobuffalo
- name: homebrew-tap
+brews:
+ -
+ github:
+ owner: gobuffalo
+ name: homebrew-tap
 <% } %>

Makefile

@@ -2,9 +2,9 @@ TAGS ?= "sqlite"
 GO_BIN ?= go
 
 install: deps
- echo "installing packr v1"
- packr
- $(GO_BIN) install -v ./packr
+ echo "installing packr v2"
+ packr2
+ $(GO_BIN) install -v ./packr2
 
 tidy:
 ifeq ($(GO111MODULE),on)
@@ -14,46 +14,28 @@ else
 endif
 
 deps:
- rm -rf packrd
- rm -rf v2/packrd
- $(GO_BIN) get github.com/gobuffalo/release
  $(GO_BIN) get -tags ${TAGS} -t ./...
- $(GO_BIN) install -v ./packr
- packr clean
+ $(GO_BIN) install -v ./packr2
  make tidy
 
 build: deps
- packr
- $(GO_BIN) build -v .
+ packr2
+ $(GO_BIN) build -v ./packr2
  make tidy
 
 test:
- packr clean
+ packr2
  $(GO_BIN) test -tags ${TAGS} ./...
- packr clean
-
-ci-deps:
- rm -rf packrd
- rm -rf v2/packrd
- $(GO_BIN) get -tags ${TAGS} -t ./...
- $(GO_BIN) install -v ./packr
- packr clean
- make tidy
-
-ci-test:
- $(GO_BIN) test -v -tags ${TAGS} -race ./...
  make tidy
- cd ./v2 && make ci-test
 
 lint:
  gometalinter --vendor ./... --deadline=1m --skip=internal
 
 update:
- $(GO_BIN) get -u -tags ${TAGS}
+ $(GO_BIN) get -u -tags ${TAGS} ./...
  make tidy
- packr
- make test
  make install
+ make test
  make tidy
 
 release-test: