Skip to content
This repository has been archived by the owner on Aug 9, 2021. It is now read-only.

Commit

Permalink
Merge 4afab2e into 7689771
Browse files Browse the repository at this point in the history
  • Loading branch information
AnalogJ authored Nov 17, 2019
2 parents 7689771 + 4afab2e commit 794c3e3
Show file tree
Hide file tree
Showing 15 changed files with 485 additions and 52 deletions.
60 changes: 34 additions & 26 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@

[[constraint]]
name = "github.com/seborama/govcr"
# version = "2.4.1"
revision = "a20ea7b5807f64c80cf6ed51de68063ad05164f4"
# version = "v4.5.0"
revision = "3842ef9d41141d7a28074e3911978d79423053ef"

[[constraint]]
name = "github.com/stretchr/testify"
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ COPY . .

## download deps & move libgit2 library into expected location.
RUN git --version \
&& dep ensure \
&& go mod vendor \
&& mkdir -p vendor/gopkg.in/libgit2/git2go.v25/vendor/libgit2/build/ \
&& cp -r /usr/local/linux/lib/pkgconfig/. /go/src/github.com/analogj/capsulecd/vendor/gopkg.in/libgit2/git2go.v25/vendor/libgit2/build/ \
&& . /scripts/toolchains/linux/linux-build-env.sh \
Expand Down
2 changes: 1 addition & 1 deletion ci/test-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ for d in $(go list ./...); do
OUTPUT_PATH=$(echo "$d" | sed -e "s/^github.com\/analogj\/capsulecd\///")
echo "Generating TEST BINARY: ${OUTPUT_PATH}/test_binary_${1}"
mkdir -p /caches/test-binaries/${OUTPUT_PATH}
go test -race -covermode=atomic -tags="static $1" -c -o=${OUTPUT_PATH}/test_binary_${1} $d
go test -mod vendor -race -covermode=atomic -tags="static $1" -c -o=${OUTPUT_PATH}/test_binary_${1} $d
done
2 changes: 1 addition & 1 deletion cmd/capsulecd/capsulecd.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func main() {
},
Before: func(c *cli.Context) error {

capsuleUrl := "https://github.com/AnalogJ/capsulecd"
capsuleUrl := "github.com/AnalogJ/capsulecd"

versionInfo := fmt.Sprintf("%s.%s-%s", goos, goarch, version.VERSION)

Expand Down
32 changes: 32 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
module github.com/analogj/capsulecd

go 1.13

require (
github.com/Masterminds/semver v1.5.0
github.com/analogj/go-bitbucket v0.4.1-0.20180829210310-6acaddff5364
github.com/golang/mock v1.3.1-0.20190508161146-9fa652df1129
github.com/golang/protobuf v1.3.2 // indirect
github.com/google/go-github v17.0.0+incompatible
github.com/google/go-querystring v1.0.0 // indirect
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
github.com/k0kubun/pp v2.4.0+incompatible // indirect
github.com/kvz/logstreamer v0.0.0-20150507115422-a635b98146f0
github.com/magiconair/properties v1.8.1 // indirect
github.com/mattn/go-colorable v0.1.2 // indirect
github.com/mattn/go-isatty v0.0.9 // indirect
github.com/mitchellh/mapstructure v1.1.2
github.com/pelletier/go-toml v1.4.0 // indirect
github.com/seborama/govcr v2.4.2+incompatible
github.com/spf13/afero v1.2.2 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/viper v1.4.0
github.com/stretchr/testify v1.4.0
github.com/urfave/cli v1.19.1
golang.org/x/net v0.0.0-20190909003024-a7b16738d86b // indirect
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
golang.org/x/sys v0.0.0-20190911201528-7ad0cfa0b7b5 // indirect
google.golang.org/appengine v1.6.2 // indirect
gopkg.in/libgit2/git2go.v25 v25.0.0-20170120134632-334260d743d7
gopkg.in/yaml.v2 v2.2.2
)
Loading

0 comments on commit 794c3e3

Please sign in to comment.