Skip to content
This repository was archived by the owner on Jun 25, 2022. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: gobuffalo/packr
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.8.1
Choose a base ref
...
head repository: gobuffalo/packr
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.8.2
Choose a head ref
  • 8 commits
  • 164 files changed
  • 3 contributors

Commits on Nov 10, 2020

  1. Rollback SHOULDERS.md

    stanislas-m authored Nov 10, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1968755 View commit details

Commits on Oct 30, 2021

  1. remove v1 files

    sio4 committed Oct 30, 2021
    Copy the full SHA
    739c4c5 View commit details
  2. moved v2 files from v2/ to /

    sio4 committed Oct 30, 2021
    Copy the full SHA
    fe7cd58 View commit details
  3. updated modules and workflow

    sio4 committed Oct 30, 2021
    Copy the full SHA
    50c0668 View commit details

Commits on Nov 3, 2021

  1. Copy the full SHA
    8b30f4c View commit details

Commits on Nov 4, 2021

  1. Copy the full SHA
    bcffcc4 View commit details

Commits on Nov 10, 2021

  1. Copy the full SHA
    5d4036d View commit details

Commits on Nov 19, 2021

  1. Merge pull request #295 from gochigo/version2-only

    made master branch to be v2 and updated dependencies
    paganotoni authored Nov 19, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    410d31e View commit details
Showing with 1,367 additions and 3,110 deletions.
  1. +4 −12 .github/workflows/tests.yml
  2. +16 −6 .goreleaser.yml
  3. +16 −6 .goreleaser.yml.plush
  4. +9 −27 Makefile
  5. +96 −66 README.md
  6. +18 −4 SHOULDERS.md
  7. 0 {v2 → }/_fixtures/http_test/css/main.css
  8. 0 {v2 → }/_fixtures/http_test/footer.html
  9. 0 {v2 → }/_fixtures/http_test/index.html
  10. 0 {v2 → }/_fixtures/http_test/sub/index.html
  11. 0 {v2 → }/_fixtures/import_pkg/import_pkg.go
  12. 0 {v2 → }/_fixtures/import_pkg/import_pkg_test.go
  13. 0 {v2 → }/_fixtures/import_pkg/pkg_test/1.txt
  14. 0 {v2 → }/_fixtures/import_pkg/pkg_test/2.txt
  15. 0 {fixtures/foo → _fixtures/list_test}/a.txt
  16. 0 {fixtures/foo/bar → _fixtures/list_test/b}/b.txt
  17. 0 {v2 → }/_fixtures/list_test/b/b2.txt
  18. 0 {v2 → }/_fixtures/list_test/c/c.txt
  19. 0 {v2 → }/_fixtures/templates/foo.txt
  20. +166 −154 box.go
  21. 0 {v2 → }/box_import_test.go
  22. 0 {v2 → }/box_map.go
  23. 0 {v2 → }/box_map_test.go
  24. +197 −73 box_test.go
  25. +0 −75 builder/box.go
  26. +0 −171 builder/builder.go
  27. +0 −78 builder/builder_test.go
  28. +0 −37 builder/clean.go
  29. +0 −10 builder/file.go
  30. +0 −7 builder/pkg.go
  31. +0 −18 builder/tmpl.go
  32. +0 −247 builder/visitor.go
  33. +0 −18 builder/visitor_test.go
  34. 0 {v2 → }/deprecated.go
  35. 0 {v2 → }/deprecated_test.go
  36. 0 {v2 → }/dirs_map.go
  37. +0 −13 env.go
  38. +0 −3 example/assets/app.css
  39. +0 −1 example/assets/app.js
  40. 0 example/bar/bar.html
  41. 0 example/bar/sub/sub.html
  42. 0 example/baz/baz.html
  43. 0 example/constant/constant.html
  44. +0 −42 example/example.go
  45. +0 −7 example/foo/bar.go
  46. +0 −7 example/foo/foo.go
  47. +0 −11 example/sf/foo.html
  48. +0 −12 example/templates/index.html
  49. 0 example/variable/variable.html
  50. +0 −5 file.go
  51. 0 {v2 → }/file/file.go
  52. 0 {v2 → }/file/info.go
  53. 0 {v2 → }/file/resolver/_fixtures/templates/foo.txt
  54. 0 {v2 → }/file/resolver/disk.go
  55. 0 {v2 → }/file/resolver/disk_test.go
  56. 0 {v2 → }/file/resolver/encoding/hex/hex.go
  57. 0 {v2 → }/file/resolver/hex_gzip.go
  58. 0 {v2 → }/file/resolver/hex_gzip_test.go
  59. 0 {v2 → }/file/resolver/ident.go
  60. 0 {v2 → }/file/resolver/ident_test.go
  61. 0 {v2 → }/file/resolver/in_memory.go
  62. 0 {v2 → }/file/resolver/in_memory_test.go
  63. 0 {v2 → }/file/resolver/packable.go
  64. 0 {v2 → }/file/resolver/resolver.go
  65. 0 {v2 → }/file/resolver/resolver_test.go
  66. +0 −1 fixtures/MyFile.txt
  67. +0 −1 fixtures/goodbye.txt
  68. +0 −1 fixtures/hello.txt
  69. +0 −1 fixtures/index.html
  70. +14 −8 go.mod
  71. +574 −50 go.sum
  72. 0 {v2 → }/helpers.go
  73. +113 −26 http_box_test.go
  74. 0 {v2 → }/jam/pack.go
  75. 0 {v2 → }/jam/parser/_fixtures/new_from_roots/_r/r.go
  76. 0 {v2 → }/jam/parser/_fixtures/new_from_roots/e/e.go
  77. 0 {v2 → }/jam/parser/_fixtures/new_from_roots/q.go
  78. 0 {v2 → }/jam/parser/_fixtures/new_from_roots/w/w.go
  79. 0 {v2 → }/jam/parser/args.go
  80. 0 {v2 → }/jam/parser/box.go
  81. 0 {v2 → }/jam/parser/file.go
  82. 0 {v2 → }/jam/parser/finder.go
  83. 0 {v2 → }/jam/parser/gogen.go
  84. 0 {v2 → }/jam/parser/parser.go
  85. 0 {v2 → }/jam/parser/parser_test.go
  86. 0 {v2 → }/jam/parser/prospect.go
  87. 0 {v2 → }/jam/parser/prospect_test.go
  88. 0 {v2 → }/jam/parser/roots.go
  89. 0 {v2 → }/jam/parser/visitor.go
  90. 0 {v2 → }/jam/parser/visitor_test.go
  91. 0 {v2 → }/jam/store/_fixtures/disk-pack/a/a.go
  92. 0 {v2 → }/jam/store/_fixtures/disk-pack/b/b.go
  93. 0 {v2 → }/jam/store/_fixtures/disk-pack/c/d.txt
  94. 0 {v2 → }/jam/store/_fixtures/disk-pack/c/e.txt
  95. 0 {v2 → }/jam/store/_fixtures/disk-pack/c/f.txt
  96. 0 {v2 → }/jam/store/_fixtures/disk-pack/go.mod
  97. 0 {v2 → }/jam/store/_fixtures/disk-pack/go.sum
  98. 0 {v2 → }/jam/store/_fixtures/disk/_r/r.go
  99. 0 {v2 → }/jam/store/_fixtures/disk/e/e.go
  100. 0 {v2 → }/jam/store/_fixtures/disk/e/heartbreakers/refugee.txt
  101. 0 {v2 → }/jam/store/_fixtures/disk/e/petty/fallin.txt
  102. 0 {v2 → }/jam/store/_fixtures/disk/franklin/aretha.txt
  103. 0 {v2 → }/jam/store/_fixtures/disk/franklin/think.txt
  104. 0 {v2 → }/jam/store/_fixtures/disk/q.go
  105. 0 {v2 → }/jam/store/_fixtures/disk/w/w.go
  106. 0 {v2 → }/jam/store/clean.go
  107. +25 −42 {v2 → }/jam/store/disk.go
  108. 0 {v2 → }/jam/store/disk_packed_test.go
  109. 0 {v2 → }/jam/store/disk_test.go
  110. 0 {v2 → }/jam/store/disk_tmpl.go
  111. 0 {v2 → }/jam/store/env.go
  112. 0 {v2 → }/jam/store/fn.go
  113. 0 {v2 → }/jam/store/legacy.go
  114. 0 {v2 → }/jam/store/legacy_test.go
  115. 0 {v2 → }/jam/store/store.go
  116. 0 {v2 → }/jam/store/store_test.go
  117. +38 −56 packr.go
  118. +0 −39 packr/cmd/build.go
  119. +0 −18 packr/cmd/clean.go
  120. +0 −50 packr/cmd/install.go
  121. +0 −55 packr/cmd/root.go
  122. +0 −20 packr/cmd/version.go
  123. +0 −21 packr/main.go
  124. 0 {v2 → }/packr2/LICENSE
  125. 0 {v2 → }/packr2/cmd/build.go
  126. 0 {v2 → }/packr2/cmd/clean.go
  127. 0 {v2 → }/packr2/cmd/fix.go
  128. 0 {v2 → }/packr2/cmd/fix/fix.go
  129. 0 {v2 → }/packr2/cmd/fix/imports.go
  130. 0 {v2 → }/packr2/cmd/fix/runner.go
  131. 0 {v2 → }/packr2/cmd/gocmd.go
  132. 0 {v2 → }/packr2/cmd/install.go
  133. 0 {v2 → }/packr2/cmd/pack.go
  134. 0 {v2 → }/packr2/cmd/root.go
  135. 0 {v2 → }/packr2/cmd/version.go
  136. 0 {v2 → }/packr2/main.go
  137. +8 −43 packr_test.go
  138. 0 {v2 → }/plog/plog.go
  139. 0 {v2 → }/pointer.go
  140. 0 {v2 → }/pointer_test.go
  141. 0 {v2 → }/resolvers_map.go
  142. +0 −3 v2/.gometalinter.json
  143. +0 −42 v2/.goreleaser.yml
  144. +0 −39 v2/.goreleaser.yml.plush
  145. +0 −8 v2/LICENSE.txt
  146. +0 −46 v2/Makefile
  147. +0 −239 v2/README.md
  148. +0 −32 v2/SHOULDERS.md
  149. 0 v2/_fixtures/list_test/a.txt
  150. 0 v2/_fixtures/list_test/b/b.txt
  151. +0 −240 v2/box.go
  152. +0 −253 v2/box_test.go
  153. +0 −19 v2/go.mod
  154. +0 −180 v2/go.sum
  155. +0 −169 v2/http_box_test.go
  156. +0 −37 v2/internal/envy.go
  157. +0 −56 v2/packr.go
  158. +0 −11 v2/packr_test.go
  159. +0 −4 v2/version.go
  160. +0 −80 v2/walk.go
  161. +0 −39 v2/walk_test.go
  162. +2 −1 version.go
  163. +49 −32 walk.go
  164. +22 −38 walk_test.go
16 changes: 4 additions & 12 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -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
22 changes: 16 additions & 6 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -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

22 changes: 16 additions & 6 deletions .goreleaser.yml.plush
Original file line number Diff line number Diff line change
@@ -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
<% } %>
36 changes: 9 additions & 27 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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:
Loading