|
01c6f06b4b
|
Merge remote-tracking branch 'origin/master' into bvander/deploy-to-k8s-dev
|
2021-08-28 09:28:36 -07:00 |
|
|
17333af88f
|
Merge branch 'bvander/docker-vm-builds' into 'master'
docker vm builds
See merge request grassrootseconomics/cic-internal-integration!259
|
2021-08-28 16:26:16 +00:00 |
|
|
6a68d2ed32
|
docker vm builds
|
2021-08-28 16:26:16 +00:00 |
|
Louis Holbrook
|
ef77f4c99a
|
Merge branch 'lash/normalize-backend-tx' into 'master'
Normalize tx data for backend
Closes cic-eth#133
See merge request grassrootseconomics/cic-internal-integration!258
|
2021-08-28 11:10:18 +00:00 |
|
Louis Holbrook
|
56dbe8a502
|
Normalize tx data for backend
|
2021-08-28 11:10:18 +00:00 |
|
Louis Holbrook
|
2dc8ac6a12
|
Merge branch 'lash/upgrade-outer-tools' into 'master'
Upgrade outer tools
See merge request grassrootseconomics/cic-internal-integration!257
|
2021-08-27 13:13:00 +00:00 |
|
Louis Holbrook
|
0ced68e224
|
Upgrade outer tools
|
2021-08-27 13:13:00 +00:00 |
|
|
415d64a4bd
|
Merge branch 'master' into bvander/deploy-to-k8s-dev
|
2021-08-25 08:57:39 -07:00 |
|
|
2afb20e715
|
Merge branch 'philip/ussd-post-test-bug-fixes' into 'master'
USSD post-test bug fixes
See merge request grassrootseconomics/cic-internal-integration!244
|
2021-08-25 10:33:35 +00:00 |
|
|
3b0113d0e4
|
USSD post-test bug fixes
|
2021-08-25 10:33:35 +00:00 |
|
Louis Holbrook
|
ebf4743a84
|
Merge branch 'lash/traffic-script-rehab' into 'master'
Implement chainlib cli for traffic script
See merge request grassrootseconomics/cic-internal-integration!255
|
2021-08-25 09:33:23 +00:00 |
|
Louis Holbrook
|
3bf92e7a8a
|
Implement chainlib cli for traffic script
|
2021-08-25 09:33:23 +00:00 |
|
|
79d29689f9
|
Merge branch 'master' into bvander/deploy-to-k8s-dev
|
2021-08-24 16:00:34 -07:00 |
|
|
f0b4c42c68
|
cleanup contract migration dockerfiles
|
2021-08-24 15:33:18 -07:00 |
|
|
83f1161772
|
peppa pig
|
2021-08-24 14:53:22 -07:00 |
|
|
93cedcc3dd
|
remove flux stuff
|
2021-08-24 14:27:00 -07:00 |
|
|
293c8d4b57
|
remove af secrets
|
2021-08-24 14:24:35 -07:00 |
|
Louis Holbrook
|
b62d00180c
|
Merge branch 'lash/cic-eth-seeding-fix' into 'master'
cic-eth data seeding rehab
See merge request grassrootseconomics/cic-internal-integration!254
|
2021-08-24 21:07:36 +00:00 |
|
Louis Holbrook
|
a49978cc36
|
cic-eth data seeding rehab
|
2021-08-24 21:07:36 +00:00 |
|
|
01fef92166
|
fix user proxy deployment
|
2021-08-24 12:39:45 -07:00 |
|
|
41a7f483cc
|
update the deploy script part
|
2021-08-24 12:22:34 -07:00 |
|
|
aaa91dab63
|
Merge branch 'master' into bvander/deploy-to-k8s-dev
|
2021-08-24 12:04:08 -07:00 |
|
|
1b0ee269d0
|
add pre tag to contract-migration
|
2021-08-24 11:43:39 -07:00 |
|
|
aa2f363b27
|
fix em
|
2021-08-24 10:42:30 -07:00 |
|
|
2a24ce6938
|
remove mount
|
2021-08-24 10:33:53 -07:00 |
|
|
938a10b5c3
|
contract-migration ci parity
|
2021-08-24 10:26:09 -07:00 |
|
|
c0e0836a08
|
Merge remote-tracking branch 'origin/master' into bvander/deploy-to-k8s-dev
|
2021-08-24 09:48:56 -07:00 |
|
|
434805c914
|
progress
|
2021-08-24 09:48:38 -07:00 |
|
Louis Holbrook
|
76e33e578b
|
Merge branch 'lash/verify-details' into 'master'
Add target count to verify
Closes #103
See merge request grassrootseconomics/cic-internal-integration!246
|
2021-08-24 15:56:41 +00:00 |
|
Louis Holbrook
|
2ec4262734
|
Add target count to verify
|
2021-08-24 15:56:41 +00:00 |
|
Louis Holbrook
|
7684fe3883
|
Merge branch 'lash/cic-eth-upgrade-more' into 'master'
Upgrade cic-ussd deps
See merge request grassrootseconomics/cic-internal-integration!247
|
2021-08-24 15:25:11 +00:00 |
|
Louis Holbrook
|
995a148c6a
|
Upgrade cic-ussd deps
|
2021-08-24 15:25:11 +00:00 |
|
Louis Holbrook
|
511e099689
|
Merge branch 'lash/signer-update' into 'master'
Update signer
See merge request grassrootseconomics/cic-internal-integration!253
|
2021-08-24 11:35:52 +00:00 |
|
Louis Holbrook
|
f877218c55
|
Update signer
|
2021-08-24 11:35:52 +00:00 |
|
|
6f7000f234
|
run contract migration to completion
|
2021-08-23 14:23:34 -07:00 |
|
|
183bb1e50b
|
fix images and remove last script
|
2021-08-23 14:05:51 -07:00 |
|
|
8240a79b0e
|
fix paths
|
2021-08-23 13:52:41 -07:00 |
|
|
ea6ce88dab
|
try and launch some k8s
|
2021-08-23 13:46:17 -07:00 |
|
|
70ce759564
|
more debugging
|
2021-08-23 12:16:59 -07:00 |
|
|
bca5d4d09f
|
maybe just a typo
|
2021-08-23 11:58:16 -07:00 |
|
|
a3c0539114
|
added secrets can we read
|
2021-08-23 10:40:32 -07:00 |
|
|
a2fbdd8338
|
ci debug
|
2021-08-23 09:55:52 -07:00 |
|
|
3f850913ed
|
move the kaniko image to no be default
|
2021-08-23 09:54:05 -07:00 |
|
|
6e97c41b78
|
try adding a k8s job
|
2021-08-23 09:50:05 -07:00 |
|
|
8ac9a1e99a
|
reverting to fffb2bc3f4
|
2021-08-21 13:23:43 -04:00 |
|
|
c4cb095a29
|
Merge branch 'bvander/fix-cic-staff-client-docker' into 'master'
fix issues with build cicada, now it should do auto reload
See merge request grassrootseconomics/cic-internal-integration!250
|
2021-08-19 20:15:22 +00:00 |
|
|
05b8bbbbca
|
fix issues with build cicada, now it should do auto reload
|
2021-08-19 20:15:22 +00:00 |
|
|
1ce32fbbe0
|
Merge branch 'fix-meta-docker-compose' into 'master'
fix a bug in the meta tag
See merge request grassrootseconomics/cic-internal-integration!249
|
2021-08-19 16:48:43 +00:00 |
|
|
3fd5e77e2c
|
fix a bug in the meta tag
|
2021-08-19 12:46:32 -04:00 |
|
|
e27a49ef33
|
add docker swarm deployment configs and remove dependency on kaniko for ci builds
|
2021-08-19 12:29:41 -04:00 |
|