File tree Expand file tree Collapse file tree 9 files changed +14
-15
lines changed Expand file tree Collapse file tree 9 files changed +14
-15
lines changed Original file line number Diff line number Diff line change 2222
2323 - name : Install Go deps
2424 run : |
25- go get github.com/GeertJohan /go.rice/rice
25+ go get github.com/cmaglie /go.rice/rice
2626
2727 - name : Install Taskfile
2828 uses : Arduino/actions/setup-taskfile@master
Original file line number Diff line number Diff line change 3232 go get github.com/golangci/govet
3333 go get golang.org/x/lint/golint
3434 go get github.com/golang/protobuf/protoc-gen-go
35- go get github.com/GeertJohan /go.rice/rice
35+ go get github.com/cmaglie /go.rice/rice
3636 shell : bash
3737
3838 - name : Install Taskfile
Original file line number Diff line number Diff line change @@ -18,8 +18,8 @@ package security
1818import (
1919 "fmt"
2020
21- rice "github.com/GeertJohan/go.rice"
2221 "github.com/arduino/go-paths-helper"
22+ rice "github.com/cmaglie/go.rice"
2323 "golang.org/x/crypto/openpgp"
2424)
2525
Original file line number Diff line number Diff line change @@ -2,16 +2,13 @@ module github.com/arduino/arduino-cli
22
33go 1.14
44
5- // This one must be kept until https://github.com/GeertJohan/go.rice/pull/159 is merged
6- replace github.com/GeertJohan/go.rice => github.com/cmaglie/go.rice v1.0.1
7-
85require (
9- github.com/GeertJohan/go.rice v1.0.0
106 github.com/arduino/board-discovery v0.0.0-20180823133458-1ba29327fb0c
117 github.com/arduino/go-paths-helper v1.3.2
128 github.com/arduino/go-properties-orderedmap v1.3.0
139 github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b
1410 github.com/arduino/go-win32-utils v0.0.0-20180330194947-ed041402e83b
11+ github.com/cmaglie/go.rice v1.0.3 // This one must be kept until https://github.com/GeertJohan/go.rice/pull/159 is merged
1512 github.com/cmaglie/pb v1.0.27
1613 github.com/codeclysm/cc v1.2.2 // indirect
1714 github.com/codeclysm/extract/v3 v3.0.1
Original file line number Diff line number Diff line change @@ -28,8 +28,8 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce
2828github.com/census-instrumentation/opencensus-proto v0.2.1 /go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU =
2929github.com/cespare/xxhash v1.1.0 /go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc =
3030github.com/client9/misspell v0.3.4 /go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw =
31- github.com/cmaglie/go.rice v1.0.1 h1:3jnwuiZ7w6VZ9348Ux6BNdknTsUsUfQxk/uqZZw7OdQ =
32- github.com/cmaglie/go.rice v1.0.1 /go.mod h1:6n5Svb/wfzAWT9V3ZtDe8xk6rjbOX/cHu3obOH0Loew =
31+ github.com/cmaglie/go.rice v1.0.3 h1:ZBLmBdQp6ejc+n8eMNH0uuRSKkg6kKe6ORjXKnyHBYw =
32+ github.com/cmaglie/go.rice v1.0.3 /go.mod h1:AF3bOWkvdOpp8/S3UL8qbQ4N7DiISIbJtj54GWFPAsc =
3333github.com/cmaglie/pb v1.0.27 h1:ynGj8vBXR+dtj4B7Q/W/qGt31771Ux5iFfRQBnwdQiA =
3434github.com/cmaglie/pb v1.0.27 /go.mod h1:GilkKZMXYjBA4NxItWFfO+lwkp59PLHQ+IOW/b/kmZI =
3535github.com/codeclysm/cc v1.2.2 h1:1ChS4EvWTjw6bH2sd6QiMcmih0itVVrWdh9MmOliX/I =
@@ -163,6 +163,7 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh
163163github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223 /go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U =
164164github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs =
165165github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e /go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno =
166+ github.com/nkovacs/streamquote v1.0.0 h1:PmVIV08Zlx2lZK5fFZlMZ04eHcDTIFJCv/5/0twVUow =
166167github.com/nkovacs/streamquote v1.0.0 /go.mod h1:BN+NaZ2CmdKqUuTUXUEm9j95B2TRbpOWpxbJYzzgUsc =
167168github.com/oklog/ulid v1.3.1 /go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U =
168169github.com/oleksandr/bonjour v0.0.0-20160508152359-5dcf00d8b228 h1:Cvfd2dOlXIPTeEkOT/h8PyK4phBngOM4at9/jlgy7d4 =
Original file line number Diff line number Diff line change @@ -7,11 +7,11 @@ source using the `go/ast` package to generate the `en` locale using these messag
77
88## Updating messages to reflect code changes
99
10- Install [ go-rice] ( https://github.com/GeertJohan /go.rice )
10+ Install [ go-rice] ( https://github.com/cmaglie /go.rice )
1111
1212``` sh
13- go get github.com/GeertJohan /go.rice
14- go get github.com/GeertJohan /go.rice/rice
13+ go get github.com/cmaglie /go.rice
14+ go get github.com/cmaglie /go.rice/rice
1515```
1616
1717The following command updates the locales present in the source code to reflect addition/removal of messages.
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ import (
2121 "strings"
2222 "sync"
2323
24- rice "github.com/GeertJohan /go.rice"
24+ rice "github.com/cmaglie /go.rice"
2525 "github.com/leonelquinteros/gotext"
2626)
2727
You can’t perform that action at this time.
0 commit comments