Skip to content

Commit 80e0a2b

Browse files
sanderpicksanderpick
authored
Stripe pagination fix and other nits (#461)
* tmp: use non-pulling threads Signed-off-by: Sander Pick <sanderpick@gmail.com> * hub: nits to billing output Signed-off-by: Sander Pick <sanderpick@gmail.com> * ci: bump test timeout to 60m Signed-off-by: Sander Pick <sanderpick@gmail.com> * docker: remove .dockerignore Signed-off-by: Sander Pick <sanderpick@gmail.com> * bingo: update mods Signed-off-by: Sander Pick <sanderpick@gmail.com> * docker: update gitignore Signed-off-by: Sander Pick <sanderpick@gmail.com> * ci: use new self hosted runners Signed-off-by: Sander Pick <sanderpick@gmail.com> * ci: use different mongo and ipfs addresses Signed-off-by: Sander Pick <sanderpick@gmail.com> * ci: send test jobs to same runner Signed-off-by: Sander Pick <sanderpick@gmail.com> * test: fix bad import cycle Signed-off-by: Sander Pick <sanderpick@gmail.com>
1 parent 4149a93 commit 80e0a2b

File tree

30 files changed

+311
-273
lines changed

30 files changed

+311
-273
lines changed

‎.bingo/buf.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
22

3-
go 1.14
3+
go 1.15
44

55
require github.com/bufbuild/buf v0.20.5 // cmd/buf

‎.bingo/go.mod‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
module _ // Fake go.mod auto-created by 'bingo' for go -moddir compatibility with non-Go projects. Commit this file, together with other .mod files.
1+
module _ // Fake go.mod auto-created by 'bingo' for go -moddir compatibility with non-Go projects. Commit this file, together with other .mod files.
2+
3+
go 1.15

‎.bingo/gomplate.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
22

3-
go 1.14
3+
go 1.15
44

55
require github.com/hairyhenderson/gomplate/v3 v3.8.0 // cmd/gomplate

‎.bingo/govvv.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
22

3-
go 1.14
3+
go 1.15
44

55
require github.com/ahmetb/govvv v0.3.0

‎.bingo/gox.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
22

3-
go 1.14
3+
go 1.15
44

55
require github.com/mitchellh/gox v1.0.1

‎.bingo/protoc-gen-buf-check-breaking.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
22

3-
go 1.14
3+
go 1.15
44

55
require github.com/bufbuild/buf v0.20.5 // cmd/protoc-gen-buf-check-breaking

‎.bingo/protoc-gen-buf-check-lint.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
22

3-
go 1.14
3+
go 1.15
44

55
require github.com/bufbuild/buf v0.20.5 // cmd/protoc-gen-buf-check-lint

‎.dockerignore‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.github/workflows/test.yml‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ on:
99
jobs:
1010
api:
1111
name: API
12-
runs-on: ubuntu-latest
12+
runs-on: [self-hosted, hub1]
1313
services:
1414
mongodb:
1515
image: mongo:latest
1616
ports:
17-
- 127.0.0.1:27017:27017
17+
- 127.0.0.1:27018:27017
1818
ipfs:
1919
image: ipfs/go-ipfs:v0.7.0
2020
env:
2121
IPFS_PROFILE: test
2222
ports:
23-
- 127.0.0.1:5011:5001
23+
- 127.0.0.1:5012:5001
2424
steps:
2525
- name: setup
2626
uses: actions/setup-go@v1
@@ -31,22 +31,24 @@ jobs:
3131
- name: test
3232
env:
3333
SKIP_SERVICES: true
34+
MONGO_URI: mongodb://127.0.0.1:27018
35+
IPFS_API_ADDR: /ip4/127.0.0.1/tcp/5012
3436
STRIPE_API_KEY: ${{ secrets.STRIPE_API_KEY }}
35-
run: go test -v -timeout 30m -race ./api/... ./mongodb/...
37+
run: go test -v -timeout 60m -race ./api/... ./mongodb/...
3638
buckets:
3739
name: Buckets
38-
runs-on: ubuntu-latest
40+
runs-on: [self-hosted, hub2]
3941
services:
4042
mongodb:
4143
image: mongo:latest
4244
ports:
43-
- 127.0.0.1:27017:27017
45+
- 127.0.0.1:27019:27017
4446
ipfs:
4547
image: ipfs/go-ipfs:v0.7.0
4648
env:
4749
IPFS_PROFILE: test
4850
ports:
49-
- 127.0.0.1:5011:5001
51+
- 127.0.0.1:5013:5001
5052
steps:
5153
- name: setup
5254
uses: actions/setup-go@v1
@@ -57,10 +59,12 @@ jobs:
5759
- name: test
5860
env:
5961
SKIP_SERVICES: true
60-
run: go test -v -timeout 30m -race ./buckets/...
62+
MONGO_URI: mongodb://127.0.0.1:27019
63+
IPFS_API_ADDR: /ip4/127.0.0.1/tcp/5013
64+
run: go test -v -timeout 60m -race ./buckets/...
6165
archives:
6266
name: Archives
63-
runs-on: self-hosted
67+
runs-on: [self-hosted, hub3]
6468
steps:
6569
- name: setup
6670
uses: actions/setup-go@v1
@@ -69,21 +73,21 @@ jobs:
6973
- name: checkout
7074
uses: actions/checkout@v1
7175
- name: test
72-
run: go test -v -timeout 30m -race ./integrationtest/...
76+
run: go test -v -timeout 60m -race ./integrationtest/...
7377
mail:
7478
name: Mail
75-
runs-on: ubuntu-latest
79+
runs-on: [self-hosted, hub4]
7680
services:
7781
mongodb:
7882
image: mongo:latest
7983
ports:
80-
- 127.0.0.1:27017:27017
84+
- 127.0.0.1:27020:27017
8185
ipfs:
8286
image: ipfs/go-ipfs:v0.7.0
8387
env:
8488
IPFS_PROFILE: test
8589
ports:
86-
- 127.0.0.1:5011:5001
90+
- 127.0.0.1:5014:5001
8791
steps:
8892
- name: setup
8993
uses: actions/setup-go@v1
@@ -94,4 +98,6 @@ jobs:
9498
- name: test
9599
env:
96100
SKIP_SERVICES: true
97-
run: go test -v -timeout 30m -race ./mail/...
101+
MONGO_URI: mongodb://127.0.0.1:27020
102+
IPFS_API_ADDR: /ip4/127.0.0.1/tcp/5014
103+
run: go test -v -timeout 60m -race ./mail/...

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ node_modules/
2626
.hubd/
2727
.buckd/
2828
.env
29+
.DS_Store
2930
buildtools/protoc
3031
buildtools/protoc-gen-go
3132
build/

0 commit comments

Comments
 (0)