Skip to content

Commit d304aa4

Browse files
committed
chore(circleci): tweaking circle build steps
1 parent 5469a84 commit d304aa4

File tree

4 files changed

+24
-21
lines changed

4 files changed

+24
-21
lines changed

.circleci/config.yml

+15-13
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,34 @@ jobs:
1414
- run: mkdir -p $TEST_RESULTS
1515
- run:
1616
name: Install gx
17-
command: go get -v -u github.com/whyrusleeping/gx && go get -v -u github.com/whyrusleeping/gx-go
18-
- run:
19-
name: Install non-gx deps
2017
command: >
21-
go get -t -d -v
22-
github.com/ipfs/go-datastore
23-
github.com/ipfs/go-ipfs
24-
github.com/jbenet/go-base58
25-
github.com/multiformats/go-multihash
26-
github.com/qri-io/cafs
27-
github.com/qri-io/cafs/ipfs
28-
github.com/qri-io/cafs/memfs
29-
github.com/qri-io/qri/repo/profile
30-
18+
go get -v -u
19+
github.com/whyrusleeping/gx
20+
github.com/whyrusleeping/gx-go
3121
- restore_cache:
3222
key: dependency-cache-{{ checksum "/go/src/github.com/ipfs/go-ipfs/package.json" }}
3323
- run:
3424
name: Install gx deps
3525
command: >
26+
go get github.com/ipfs/go-ipfs &&
3627
cd /go/src/github.com/ipfs/go-ipfs &&
3728
gx install &&
3829
cd /go/src/github.com/qri-io/dataset
3930
- save_cache:
4031
key: dependency-cache-{{ checksum "/go/src/github.com/ipfs/go-ipfs/package.json" }}
4132
paths:
4233
- /go/src/gx/
34+
- run:
35+
name: Install non-gx deps
36+
command: >
37+
go get -d -v
38+
github.com/ipfs/go-datastore
39+
github.com/jbenet/go-base58
40+
github.com/multiformats/go-multihash
41+
github.com/qri-io/cafs
42+
github.com/qri-io/cafs/ipfs
43+
github.com/qri-io/cafs/memfs
44+
github.com/qri-io/compare
4345
- run: go get github.com/jstemmer/go-junit-report
4446
- run:
4547
name: Run Tests

commit.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"fmt"
66

77
"github.com/ipfs/go-datastore"
8-
"github.com/qri-io/qri/repo/profile"
98
)
109

1110
// CommitMsg encapsulates information about changes to a dataset in
@@ -14,8 +13,9 @@ import (
1413
// git version control system
1514
type CommitMsg struct {
1615
path datastore.Key
17-
Author *profile.Profile `json:"author,omitempty"`
18-
Message string `json:"message"`
16+
Author *User `json:"author,omitempty"`
17+
Title string `json:"title"`
18+
Message string `json:"message,omitempty"`
1919
}
2020

2121
// NewCommitMsgRef creates an empty struct with it's
@@ -43,6 +43,7 @@ func (cm *CommitMsg) MarshalJSON() ([]byte, error) {
4343
}
4444
m := &_commitMsg{
4545
Author: cm.Author,
46+
Title: cm.Title,
4647
Message: cm.Message,
4748
}
4849
return json.Marshal(m)

commit_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"testing"
77

88
"github.com/ipfs/go-datastore"
9-
"github.com/qri-io/qri/repo/profile"
109
)
1110

1211
func TestCommitMsgMarshalJSON(t *testing.T) {
@@ -15,8 +14,8 @@ func TestCommitMsgMarshalJSON(t *testing.T) {
1514
out []byte
1615
err error
1716
}{
18-
{&CommitMsg{Message: "message"}, []byte(`{"message":"message"}`), nil},
19-
{&CommitMsg{Author: &profile.Profile{Id: "foo"}}, []byte(`{"author":{"id":"foo","created":"0001-01-01T00:00:00Z","updated":"0001-01-01T00:00:00Z","username":"","type":"user","email":"","name":"","description":"","homeUrl":"","color":"","thumbUrl":"","profileUrl":"","twitter":""},"message":""}`), nil},
17+
{&CommitMsg{Title: "title"}, []byte(`{"title":"title"}`), nil},
18+
{&CommitMsg{Author: &User{Id: "foo"}}, []byte(`{"author":{"id":"foo"},"title":""}`), nil},
2019
// {AirportCodes, []byte(`{"format":"csv","formatConfig":{"header_row":true},"path":"","query":"","schema":{"fields":[{"name":"ident","type":"string"},{"name":"type","type":"string"},{"name":"name","type":"string"},{"name":"latitude_deg","type":"float"},{"name":"longitude_deg","type":"float"},{"name":"elevation_ft","type":"integer"},{"name":"continent","type":"string"},{"name":"iso_country","type":"string"},{"name":"iso_region","type":"string"},{"name":"municipality","type":"string"},{"name":"gps_code","type":"string"},{"name":"iata_code","type":"string"},{"name":"local_code","type":"string"}]}}`), nil},
2120
}
2221

metadata.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ type VersionNumber string
1414

1515
// User is a placholder for talking about people, groups, organizations
1616
type User struct {
17-
Fullname string `fn,omitempty`
18-
Email string `email,omitempty`
17+
Id string `json:"id,omitempty"`
18+
Fullname string `json:"name,omitempty"`
19+
Email string `json:"email,omitempty"`
1920
}
2021

2122
// License represents a legal licensing agreement

0 commit comments

Comments
 (0)