Commit Graph

  • 480ed5b119 Merge branch 'master' into bvander/cic-eth-base-image-and-testing Blair Vanderlugt 2021-07-08 15:05:29 -07:00
  • 021c736707 Merge branch 'lash/demurrage-task' into 'master' Louis Holbrook 2021-07-08 15:28:05 +00:00
  • e3028a5060 Add demurrage token amount adjust task Louis Holbrook 2021-07-08 15:28:04 +00:00
  • fdf7a3a503 Omit migrations folder in coverage nolash 2021-07-08 13:32:15 +02:00
  • e3079c3930 Remove package init files from runnables in cic-cache nolash 2021-07-08 13:25:14 +02:00
  • efa23797f3 Bump aux version lash/demurrage-task nolash 2021-07-08 11:48:50 +02:00
  • e6fa450a2a put contract migration and data seeding in local context Blair Vanderlugt 2021-07-07 16:49:39 -07:00
  • 9a7ccc3228 fixed the eth build Blair Vanderlugt 2021-07-07 16:39:05 -07:00
  • 7fc99afe1b ussd pypi args Blair Vanderlugt 2021-07-07 16:24:29 -07:00
  • 5a55d76faf fix eth kaniko args Blair Vanderlugt 2021-07-07 16:20:48 -07:00
  • 74eb5df1bb fix mr to send image to right the place and can we do kaniko target arg as a variable?? Blair Vanderlugt 2021-07-07 16:15:42 -07:00
  • d9b25c1063 add notify and we done Blair Vanderlugt 2021-07-07 16:07:50 -07:00
  • 319e587f29 cic ussd refactor Blair Vanderlugt 2021-07-07 16:00:11 -07:00
  • 1bfc736513 do the dumb ci dockerfile Blair Vanderlugt 2021-07-07 15:49:00 -07:00
  • 80d7693532 do cic-cache Blair Vanderlugt 2021-07-07 15:47:42 -07:00
  • 2f36e3496e add another requirements Blair Vanderlugt 2021-07-07 15:18:28 -07:00
  • de00762c2c ok maybe this is multiline Blair Vanderlugt 2021-07-07 15:10:44 -07:00
  • a71ef0a388 is this a multiline? Blair Vanderlugt 2021-07-07 15:05:27 -07:00
  • 23cf75a4c9 multipass err...multiREQUIREMENTS Blair Vanderlugt 2021-07-07 14:58:29 -07:00
  • de36fe3fab multipass err...multiline Blair Vanderlugt 2021-07-07 14:33:32 -07:00
  • deeba250e4 fix eth and meta tests Blair Vanderlugt 2021-07-07 14:24:26 -07:00
  • 5668ed1cf5 Merge branch 'bvander/cic-eth-base-image-and-testing' of gitlab.com:grassrootseconomics/cic-internal-integration into bvander/cic-eth-base-image-and-testing Blair Vanderlugt 2021-07-07 14:08:26 -07:00
  • 8b7a26abb9 Merge branch 'master' into bvander/cic-eth-base-image-and-testing Blair Vanderlugt 2021-07-07 14:05:39 -07:00
  • 2c0f65ed73 Remove hardcoded value nolash 2021-07-07 17:42:47 +02:00
  • 3f6fbc1c61 Noop calc for non-demurrage token in aux nolash 2021-07-07 14:17:50 +02:00
  • d26af206cb Add correct extras selector for contract migration cic-eth include nolash 2021-07-07 13:52:19 +02:00
  • 36085f218f Add necessary services requirements nolash 2021-07-07 11:59:51 +02:00
  • d1d680c9aa Add aux-all to tasker in local cluster nolash 2021-07-07 10:32:01 +02:00
  • abd4024322 Bump version nolash 2021-07-07 09:59:20 +02:00
  • 644b9ec4ec Merge remote-tracking branch 'origin/master' into lash/demurrage-task nolash 2021-07-07 09:58:57 +02:00
  • 5f6c57647f Merge branch 'lash/explicit-token-type' into 'master' Louis Holbrook 2021-07-07 07:56:45 +00:00
  • ed029a936c Add explicit token type toggle in contract migration Louis Holbrook 2021-07-07 07:56:45 +00:00
  • 4cfddfeabb Merge remote-tracking branch 'origin/master' into lash/explicit-token-type lash/explicit-token-type nolash 2021-07-07 09:49:22 +02:00
  • bc52e46620 Merge remote-tracking branch 'origin/master' into lash/demurrage-task nolash 2021-07-07 09:47:09 +02:00
  • c559bb2fee Merge branch 'lash/free-api' into 'master' Louis Holbrook 2021-07-07 07:45:21 +00:00
  • 9b79034ed3 Minimal dependencies in cic-eth api setup Louis Holbrook 2021-07-07 07:45:21 +00:00
  • a4e279d722 Merge remote-tracking branch 'origin/master' into lash/explicit-token-type nolash 2021-07-07 09:34:10 +02:00
  • ba729a0a54 Properly fix mock path in cic-eth test nolash 2021-07-07 09:32:52 +02:00
  • 195fd6ea08 Remove commented code lash/free-api nolash 2021-07-07 09:30:14 +02:00
  • cb4927edc9 Correct mocks path in cic tests, faulty contract-migration build nolash 2021-07-07 09:24:40 +02:00
  • e40f15d106 Update apps/contract-migration/.gitlab-ci.yml, apps/data-seeding/.gitlab-ci.yml files Blair Vanderlugt 2021-07-06 20:41:57 +00:00
  • b94116a683 Update apps/cic-meta/.gitlab-ci.yml Blair Vanderlugt 2021-07-06 20:31:12 +00:00
  • 635ef775df Update apps/cic-meta/.gitlab-ci.yml Blair Vanderlugt 2021-07-06 20:30:12 +00:00
  • c35e230e9f Update apps/cic-notify/.gitlab-ci.yml Blair Vanderlugt 2021-07-06 20:29:06 +00:00
  • 0c842cf5d7 Update apps/cic-ussd/.gitlab-ci.yml Blair Vanderlugt 2021-07-06 20:28:29 +00:00
  • e8f65dcd29 Update apps/contract-migration/.gitlab-ci.yml, apps/data-seeding/.gitlab-ci.yml, .gitlab-ci.yml, apps/cic-cache/.gitlab-ci.yml, apps/cic-eth/.gitlab-ci.yml, apps/cic-meta/.gitlab-ci.yml, apps/cic-notify/.gitlab-ci.yml, apps/cic-ussd/.gitlab-ci.yml files Blair Vanderlugt 2021-07-06 20:27:32 +00:00
  • d679a8441e Update .gitlab-ci.yml, apps/data-seeding/.gitlab-ci.yml, apps/cic-ussd/.gitlab-ci.yml, apps/cic-notify/.gitlab-ci.yml, apps/cic-meta/.gitlab-ci.yml, apps/cic-cache/.gitlab-ci.yml files Blair Vanderlugt 2021-07-06 20:05:18 +00:00
  • 58f3a90206 Update apps/contract-migration/.gitlab-ci.yml, apps/cic-eth/.gitlab-ci.yml files Blair Vanderlugt 2021-07-06 19:54:36 +00:00
  • 3256f23121 Update apps/cic-eth/docker/Dockerfile Blair Vanderlugt 2021-07-06 19:52:55 +00:00
  • 8cdd405122 Update apps/contract-migration/docker/Dockerfile, apps/cic-eth/.gitlab-ci.yml, ci_templates/.cic-template.yml, apps/contract-migration/.gitlab-ci.yml files Blair Vanderlugt 2021-07-06 19:51:53 +00:00
  • db4eb31de0 Update apps/contract-migration/docker/Dockerfile Blair Vanderlugt 2021-07-06 19:43:44 +00:00
  • 0fa7b99a15 Update apps/contract-migration/.gitlab-ci.yml Blair Vanderlugt 2021-07-06 19:42:42 +00:00
  • b3b051d3d5 Update apps/contract-migration/.gitlab-ci.yml, apps/contract-migration/docker/Dockerfile files Blair Vanderlugt 2021-07-06 19:41:24 +00:00
  • b86b57bcb7 Update apps/contract-migration/docker/Dockerfile Blair Vanderlugt 2021-07-06 19:40:36 +00:00
  • 4ecf4f1214 Update ci_templates/.cic-template.yml, apps/cic-eth/.gitlab-ci.yml, .gitlab-ci.yml, apps/contract-migration/.gitlab-ci.yml files Blair Vanderlugt 2021-07-06 19:36:17 +00:00
  • e3da256e66 Update apps/cic-eth/.gitlab-ci.yml Blair Vanderlugt 2021-07-06 19:11:51 +00:00
  • c8e24c96c5 Update apps/cic-eth/.gitlab-ci.yml Blair Vanderlugt 2021-07-06 19:10:49 +00:00
  • ecc5d26666 Update apps/cic-eth/.gitlab-ci.yml Blair Vanderlugt 2021-07-06 19:00:09 +00:00
  • 304550c2ae Update apps/cic-eth/.gitlab-ci.yml Blair Vanderlugt 2021-07-06 18:53:04 +00:00
  • 93f0353808 added pythonpath Blair Vanderlugt 2021-07-06 11:43:59 -07:00
  • 2e6e80e134 Update ci_templates/.cic-template.yml, apps/cic-eth/.gitlab-ci.yml files Blair Vanderlugt 2021-07-06 18:12:32 +00:00
  • bc868fd2c8 add syntax line Blair Vanderlugt 2021-07-06 11:06:21 -07:00
  • 0b3b1ef459 change cic-eth context Blair Vanderlugt 2021-07-06 10:57:20 -07:00
  • f72d577b8c Update docker-compose.yml, apps/cic-eth/.gitlab-ci.yml, ci_templates/.cic-template.yml files Blair Vanderlugt 2021-07-06 17:30:12 +00:00
  • 068d1112d2 Update ci_templates/.cic-template.yml, apps/cic-eth/.gitlab-ci.yml files Blair Vanderlugt 2021-07-06 17:15:24 +00:00
  • 460a7c223b Update apps/cic-eth/docker/Dockerfile, apps/cic-eth/docker/Dockerfile_ci files Blair Vanderlugt 2021-07-06 17:11:26 +00:00
  • dd3ddfd41d Update apps/cic-eth/docker/Dockerfile_ci, apps/cic-eth/.gitlab-ci.yml files Blair Vanderlugt 2021-07-06 17:09:32 +00:00
  • 8a6a2fd008 Update ci_templates/.cic-template.yml Blair Vanderlugt 2021-07-06 17:06:11 +00:00
  • 3fca9a6744 Update .gitlab-ci.yml, ci_templates/.cic-template.yml, apps/cic-eth/docker/Dockerfile, apps/cic-eth/.gitlab-ci.yml files Blair Vanderlugt 2021-07-06 17:02:56 +00:00
  • a123122ed9 Update apps/cic-eth/.gitlab-ci.yml Blair Vanderlugt 2021-07-05 21:20:15 +00:00
  • 4c420bdcfd Update ci_templates/.cic-template.yml, apps/cic-eth/.gitlab-ci.yml files Blair Vanderlugt 2021-07-05 21:00:41 +00:00
  • 6601a3cdb6 Update apps/cic-eth/.gitlab-ci.yml Blair Vanderlugt 2021-07-05 20:49:09 +00:00
  • 1b948776ba Update ci_templates/.cic-template.yml Blair Vanderlugt 2021-07-05 20:35:06 +00:00
  • b67d1ac26a Update ci_templates/.cic-template.yml Blair Vanderlugt 2021-07-05 20:31:29 +00:00
  • e68f10fac5 Update apps/cic-eth/docker/Dockerfile Blair Vanderlugt 2021-07-05 20:22:39 +00:00
  • 6a86238cb6 Update apps/cic-eth/docker/Dockerfile Blair Vanderlugt 2021-07-05 20:19:12 +00:00
  • 5fcef25bdd Update apps/cic-eth/docker/Dockerfile Blair Vanderlugt 2021-07-05 20:17:56 +00:00
  • 3e526ba1ac Update ci_templates/.cic-template.yml, apps/cic-eth/.gitlab-ci.yml files Blair Vanderlugt 2021-07-05 20:15:07 +00:00
  • 52239e2e82 Update ci_templates/.cic-template.yml, apps/cic-eth/.gitlab-ci.yml files Blair Vanderlugt 2021-07-05 20:12:04 +00:00
  • a96508dac4 Update ci_templates/.cic-template.yml Blair Vanderlugt 2021-07-05 20:08:08 +00:00
  • 868a0e836c Update apps/cic-eth/.gitlab-ci.yml, apps/cic-eth/docker/Dockerfile, ci_templates/.cic-template.yml files Blair Vanderlugt 2021-07-05 19:59:27 +00:00
  • dadab0a20b Update apps/cic-eth/docker/Dockerfile Blair Vanderlugt 2021-07-05 19:26:23 +00:00
  • a4b00545d3 Merge remote-tracking branch 'origin/master' into lash/free-api nolash 2021-07-05 19:28:40 +02:00
  • b7d5c6799f Merge branch 'bvander/data-seeding-updates' into 'master' Blair Vanderlugt 2021-07-05 17:14:47 +00:00
  • eef8bb2cf7 data-seeding image updates and tweak meta import Blair Vanderlugt 2021-07-05 17:14:46 +00:00
  • cf96fee430 Merge branch 'bvander/contract-migration-caching' into 'master' Blair Vanderlugt 2021-07-05 17:13:27 +00:00
  • 9740963431 refactor contract-migration and add buildkit caching Blair Vanderlugt 2021-07-05 17:13:26 +00:00
  • 2fd275eb1b Add explicit token type toggle in contract migration nolash 2021-07-05 15:42:47 +02:00
  • 185458e320 Merge remote-tracking branch 'origin/master' into lash/demurrage-task nolash 2021-07-05 13:05:02 +02:00
  • 08aef8804b Merge remote-tracking branch 'origin/master' into lash/free-api nolash 2021-07-05 13:03:54 +02:00
  • a3c4932488 Merge branch 'lash/new-sarafu-token' into 'master' Louis Holbrook 2021-07-05 10:58:08 +00:00
  • aa667951be Add flavors of demurrage token to dev deployment Louis Holbrook 2021-07-05 10:58:08 +00:00
  • 8fef8c98db Correct the admin import path correction nolash 2021-07-05 12:27:52 +02:00
  • 54b857d286 Merge remote-tracking branch 'origin/master' into lash/free-api nolash 2021-07-05 12:25:05 +02:00
  • b917070155 Correct admin api import path in tests nolash 2021-07-05 12:22:53 +02:00
  • ae3a8de2d4 Add redis to test reqs nolash 2021-07-05 12:02:37 +02:00
  • d9214ddd62 Bump cic-eth dep to future build nolash 2021-07-05 11:59:52 +02:00
  • b5d6d80d8e Add demurrage token task api nolash 2021-07-05 11:58:07 +02:00
  • ceaafeb513 Add eth-erc20 dep to tests reqs nolash 2021-07-05 11:32:28 +02:00
  • 7cd2fc4622 Add eth-erc20 dep nolash 2021-07-05 11:32:00 +02:00