Commit Graph

610 Commits

Author SHA1 Message Date
semvervot e88b947e52 fix sbot path 2021-10-19 13:35:49 -07:00
semvervot fa96f6adce chore: fix the semver image 2021-10-19 12:12:32 -07:00
semvervot 2b4771d97a fix: the image is in cic-base-images 2021-10-18 17:52:24 -07:00
semvervot 078c2720f9 Merge branch 'master' into feat/automation/add-semver 2021-10-18 13:52:43 -07:00
semvervot c3a63d0942 chore: build cache 2021-10-18 13:52:39 -07:00
semvervot c72bb56220 feat: test this feature bump 2021-10-18 12:14:29 -07:00
semvervot a6384a46b8 fix login flags again 2021-10-18 11:06:47 -07:00
semvervot aa92c7e5e0 fix login flags 2021-10-18 11:02:08 -07:00
semvervot 0856d26fc7 docker login 2021-10-18 10:13:48 -07:00
semvervot 1f50abe13c updated sbot config 2021-10-18 10:08:44 -07:00
Blair Vanderlugt 035531ba49 url to ssh 2021-10-16 18:00:07 -07:00
Blair Vanderlugt d155566735 Update .gitlab-ci.yml 2021-10-17 00:47:49 +00:00
Blair Vanderlugt 0d5bd8edb2 run only on protected branches 2021-10-15 18:47:01 -07:00
Blair Vanderlugt ab70ecee26 added version stage 2021-10-15 15:01:42 -07:00
Blair Vanderlugt d77deb28f0 improvement: add bot ssh deploy key 2021-10-15 14:58:58 -07:00
Louis Holbrook 8f1afa094d Merge branch 'lash/update-aux-deps' into 'master'
Update aux deps

See merge request grassrootseconomics/cic-internal-integration!264
2021-10-15 20:16:49 +00:00
Louis Holbrook 1d9f134125 Update aux deps 2021-10-15 20:16:49 +00:00
Louis Holbrook b6a4bab1c8 Merge branch 'philip/ussd-cic-types-meta-tool' into 'master'
Philip/ussd cic types meta tool

See merge request grassrootseconomics/cic-internal-integration!294
2021-10-15 11:21:42 +00:00
Philip Wafula 805fc56c7b Philip/ussd cic types meta tool 2021-10-15 11:21:41 +00:00
Louis Holbrook e3d39a2144 Merge branch 'lash/no-none-callbacks' into 'master'
bug: Do not call none callbacks on token proof check

See merge request grassrootseconomics/cic-internal-integration!293
2021-10-14 13:42:09 +00:00
Louis Holbrook 90176f2806 bug: Do not call none callbacks on token proof check 2021-10-14 13:42:09 +00:00
Philip Wafula f42f223ce9 Merge branch 'lash/api-choose-token' into 'master'
feat: Add token metadata API

Closes #118

See merge request grassrootseconomics/cic-internal-integration!289
2021-10-14 13:24:51 +00:00
Louis Holbrook 045a279ac2 feat: Add token metadata API 2021-10-14 13:24:51 +00:00
Louis Holbrook 6b59c87f68 Merge branch 'lash/okota' into 'master'
feat: Integrate okota

See merge request grassrootseconomics/cic-internal-integration!286
2021-10-07 21:05:58 +00:00
Louis Holbrook 9ee42b908d feat: Integrate okota 2021-10-07 21:05:58 +00:00
Philip Wafula 3343c4163e Merge branch 'lash/more-case-case' into 'master'
bug: cic-eth transaction listings

See merge request grassrootseconomics/cic-internal-integration!285
2021-10-07 15:12:35 +00:00
Louis Holbrook f5bfc8ace2 bug: cic-eth transaction listings 2021-10-07 15:12:35 +00:00
Mohamed Sohail 8bf5c1fec5
fix: remove latest tag build step 2021-10-05 09:21:31 +03:00
Mohamed Sohail df1c38a6f0
add: semverbot config with auto git tag 2021-10-05 09:16:00 +03:00
Blair Vanderlugt 8a9d2ee0be Merge branch 'bvander/default-docker-compose' into 'master'
chore: gift defaults

See merge request grassrootseconomics/cic-internal-integration!282
2021-09-27 13:15:21 +00:00
Blair Vanderlugt 3608fd1fc7 chore: gift defaults 2021-09-27 16:14:31 +03:00
Blair Vanderlugt 0d275f358b Merge branch 'philip/removes-docker-compose-profiles' into 'master'
removes profile attrs from docker-compose file.

See merge request grassrootseconomics/cic-internal-integration!281
2021-09-27 12:33:19 +00:00
PhilipWafula 3aef2aa65f
removes profile attrs from docker-compose file. 2021-09-27 15:26:22 +03:00
Philip Wafula 5644baefb2 Merge branch 'philip/bump-cic-ussd-version' into 'master'
Bumps cic-ussd version following token fix.

See merge request grassrootseconomics/cic-internal-integration!280
2021-09-27 11:37:42 +00:00
PhilipWafula 1a7c4deab6
Bumps cic-ussd version following token fix. 2021-09-27 14:27:10 +03:00
Philip Wafula 0389d8623d Merge branch 'philip/token-value-fix' into 'master'
Refactors to avoid conversion of zero values to wei.

See merge request grassrootseconomics/cic-internal-integration!279
2021-09-22 08:17:39 +00:00
PhilipWafula cf64387d81
Refactors to avoid conversion of zero values to wei. 2021-09-22 11:10:33 +03:00
Philip Wafula 79bcc8a9f1 Merge branch 'dev-k8s-deploy-new-data-seeding' into 'master'
Dataseeding container

See merge request grassrootseconomics/cic-internal-integration!267
2021-09-21 06:04:44 +00:00
Philip Wafula 7b57f1b4c2 Dataseeding container 2021-09-21 06:04:44 +00:00
Philip Wafula 76b8519637 Merge branch 'philip/cache-migration' into 'master'
Fixes migrations in cic-cache (ideally)

See merge request grassrootseconomics/cic-internal-integration!276
2021-09-21 05:33:46 +00:00
Philip Wafula e89aec76fa Fixes migrations in cic-cache (ideally) 2021-09-21 05:33:46 +00:00
Blair Vanderlugt a138a0ec75 Merge branch 'bvander/update-buildkit-cache' into 'master'
chore: clean old dockerfile and add docs for clearing cache

See merge request grassrootseconomics/cic-internal-integration!277
2021-09-20 07:01:53 +00:00
Blair Vanderlugt 5128c7828c chore: clean old dockerfile and add docs for clearing cache 2021-09-20 09:59:12 +03:00
Philip Wafula 2f005195e5 Merge branch 'philip/ussd-cli-fix' into 'master'
Philip/ussd cli fix

See merge request grassrootseconomics/cic-internal-integration!275
2021-09-18 09:07:05 +00:00
Philip Wafula fb8db3ffd2 Philip/ussd cli fix 2021-09-18 09:07:05 +00:00
Philip Wafula b5f647c4aa Merge branch 'philip/ussd-demurrage' into 'master'
Philip/ussd demurrage

See merge request grassrootseconomics/cic-internal-integration!263
2021-09-17 11:15:43 +00:00
Philip Wafula 6019143ba1 Philip/ussd demurrage 2021-09-17 11:15:43 +00:00
Philip Wafula 610440b722 Merge branch 'lash/signer-missing-symbol' into 'master'
Update signer to fill in missing sign to wire symbol

See merge request grassrootseconomics/cic-internal-integration!273
2021-09-17 06:54:58 +00:00
Louis Holbrook d65455fc29 Update signer to fill in missing sign to wire symbol 2021-09-17 06:54:58 +00:00
Blair Vanderlugt 43f8d1c30c Merge branch 'bvander/docker-compose-restarts' into 'master'
chore: fix docker compose restarts

See merge request grassrootseconomics/cic-internal-integration!274
2021-09-16 11:17:42 +00:00