From 2454939efceeb4fb60e4a56eb5c6bc4ff0a52123 Mon Sep 17 00:00:00 2001 From: Maciej Matuszczak Date: Tue, 5 Mar 2019 16:52:19 +0100 Subject: [PATCH 01/16] test CI --- req.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/req.txt b/req.txt index e69de29..9118d6c 100644 --- a/req.txt +++ b/req.txt @@ -0,0 +1 @@ +asdasd \ No newline at end of file From 57899218d4940a1e4497f3521eff699e0111ae3f Mon Sep 17 00:00:00 2001 From: Maciej Matuszczak Date: Tue, 5 Mar 2019 17:23:17 +0100 Subject: [PATCH 02/16] blah --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index ef1b26d..2441f48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,15 +6,15 @@ python: - 3.6 jobs: include: - stage: build - script: - - pip install -r requirements.txt - - npm install - stage: test - script: - - echo Test1 - - echo Test2 - stage: deploy: - - echo deployment + - stage: "build" + script: + - pip install -r requirements.txt + - npm install + - stage: "test" + script: + - echo Test1 + - echo Test2 + - stage: "deploy" + - echo deployment after_success: - echo "Success" \ No newline at end of file From 68a4d73a0fad3c90168ae6af2c491c35df342738 Mon Sep 17 00:00:00 2001 From: Maciej Matuszczak Date: Tue, 5 Mar 2019 17:27:29 +0100 Subject: [PATCH 03/16] blah2 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 2441f48..9430132 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ jobs: - echo Test1 - echo Test2 - stage: "deploy" + script: - echo deployment after_success: - echo "Success" \ No newline at end of file From 82945306642507884d730138323b6efbfd70d891 Mon Sep 17 00:00:00 2001 From: Maciej Matuszczak Date: Tue, 5 Mar 2019 17:34:54 +0100 Subject: [PATCH 04/16] blah3 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9430132..7983711 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,7 @@ jobs: include: - stage: "build" script: - - pip install -r requirements.txt - - npm install + - make start - stage: "test" script: - echo Test1 From e04a931625db9c1775875146452cbe42a869633a Mon Sep 17 00:00:00 2001 From: Maciej Matuszczak Date: Tue, 5 Mar 2019 17:41:58 +0100 Subject: [PATCH 05/16] blah3 --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7983711..7091298 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,11 +8,11 @@ jobs: include: - stage: "build" script: - - make start + - pip install -r requirements.txt + - npm install - stage: "test" script: - - echo Test1 - - echo Test2 + - manage.py test - stage: "deploy" script: - echo deployment From 95402c7a756f329efdcdcecd4b1f6edf14e67a06 Mon Sep 17 00:00:00 2001 From: Maciej Matuszczak Date: Tue, 5 Mar 2019 18:14:04 +0100 Subject: [PATCH 06/16] blah4 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7091298..a1d7be0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ jobs: - npm install - stage: "test" script: - - manage.py test + - python manage.py test - stage: "deploy" script: - echo deployment From f3bfa3840e2c7ae88cec49f649a5b06de3c79196 Mon Sep 17 00:00:00 2001 From: Maciej Matuszczak Date: Tue, 5 Mar 2019 18:15:14 +0100 Subject: [PATCH 07/16] blah4 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a1d7be0..2071f80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ jobs: - npm install - stage: "test" script: + - pwd - python manage.py test - stage: "deploy" script: From 2dffc4481325aacfdf44b6bfd3653f4a38369400 Mon Sep 17 00:00:00 2001 From: Maciej Matuszczak Date: Tue, 5 Mar 2019 18:15:48 +0100 Subject: [PATCH 08/16] blah4 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2071f80..9430132 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,8 @@ jobs: - npm install - stage: "test" script: - - pwd - - python manage.py test + - echo Test1 + - echo Test2 - stage: "deploy" script: - echo deployment From ef27b84a5af8e8454b1ccf4d579b5a6413a9dc07 Mon Sep 17 00:00:00 2001 From: Maciej Matuszczak Date: Tue, 5 Mar 2019 18:18:06 +0100 Subject: [PATCH 09/16] blah5 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9430132..2071f80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,8 @@ jobs: - npm install - stage: "test" script: - - echo Test1 - - echo Test2 + - pwd + - python manage.py test - stage: "deploy" script: - echo deployment From 31f49c0ea86998e3c94a9d8a78d79baffc3f7fb8 Mon Sep 17 00:00:00 2001 From: Maciej Matuszczak Date: Tue, 5 Mar 2019 18:33:16 +0100 Subject: [PATCH 10/16] blah6 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 2071f80..65885bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ jobs: - stage: "test" script: - pwd + - ls -la - python manage.py test - stage: "deploy" script: From 307fb1326e06ceb0e3ed1fe7131cdccee6e07947 Mon Sep 17 00:00:00 2001 From: Maciej Matuszczak Date: Tue, 5 Mar 2019 18:54:45 +0100 Subject: [PATCH 11/16] blah7 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 65885bf..5b20330 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ jobs: script: - pwd - ls -la - - python manage.py test + - python manage.py test users - stage: "deploy" script: - echo deployment From 654006e01d0b4447bea896f40cfb1ba18b786cf0 Mon Sep 17 00:00:00 2001 From: Maciej Matuszczak Date: Tue, 5 Mar 2019 19:14:53 +0100 Subject: [PATCH 12/16] blah8 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5b20330..ea5f011 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ jobs: include: - stage: "build" script: + - sh ./.makefile/start.sh - pip install -r requirements.txt - npm install - stage: "test" From bc7dc9883eabb3fe245e45680f89e0cfc15c24cf Mon Sep 17 00:00:00 2001 From: Maciej Matuszczak Date: Sun, 10 Mar 2019 20:38:25 +0100 Subject: [PATCH 13/16] blah no --- .gitignore | 1 - app.env | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 app.env diff --git a/.gitignore b/.gitignore index e659ef0..0a854dc 100644 --- a/.gitignore +++ b/.gitignore @@ -66,5 +66,4 @@ www/ !.elasticbeanstalk/*.cfg.yml !.elasticbeanstalk/*.global.yml -app.env node_modules \ No newline at end of file diff --git a/app.env b/app.env new file mode 100644 index 0000000..571dccd --- /dev/null +++ b/app.env @@ -0,0 +1,5 @@ +SECRET_KEY=secret +DOCKER_ENVIRONMENT=True + +REDIS_HOST=redis +REDIS_PORT=6379 \ No newline at end of file From 30a709348ca884a3920d8d2a0cdbcc8f2c086169 Mon Sep 17 00:00:00 2001 From: Maciej Matuszczak Date: Sun, 10 Mar 2019 20:49:21 +0100 Subject: [PATCH 14/16] blah no2 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ea5f011..17daa14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,14 +9,13 @@ jobs: - stage: "build" script: - sh ./.makefile/start.sh - - pip install -r requirements.txt - - npm install - stage: "test" script: - pwd - ls -la - python manage.py test users - stage: "deploy" + if: branch = master script: - echo deployment after_success: From 7e38e2f05f71ec812b5b7f965c3d0e3f8416d360 Mon Sep 17 00:00:00 2001 From: Maciej Matuszczak Date: Sun, 10 Mar 2019 21:04:57 +0100 Subject: [PATCH 15/16] bals --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17daa14..239eb9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,7 @@ jobs: - sh ./.makefile/start.sh - stage: "test" script: - - pwd - - ls -la + - make start - python manage.py test users - stage: "deploy" if: branch = master From 971ad5690d91e9cfff6a4e32d3712fa83f38defb Mon Sep 17 00:00:00 2001 From: Maciej Matuszczak Date: Sun, 10 Mar 2019 21:32:34 +0100 Subject: [PATCH 16/16] blah no4 --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 239eb9f..ca5a265 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,13 @@ services: language: python python: - 3.6 + +before_install: + - sudo rm /usr/local/bin/docker-compose + - curl -L https://github.com/docker/compose/releases/download/1.18.0/docker-compose-`uname -s`-`uname -m` > docker-compose + - chmod +x docker-compose + - sudo mv docker-compose /usr/local/bin + jobs: include: - stage: "build"