From 3dbeb1541de96cbb36ef7b74268a060c20f8abc7 Mon Sep 17 00:00:00 2001 From: "Kim, Hirokuni" Date: Wed, 24 May 2017 23:43:55 +0900 Subject: [PATCH 01/10] wip --- .circleci/config.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0cef4b57..c5282fff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,14 +38,14 @@ jobs: destination: tr1 - store_test_results: path: test-reports/ - - add_ssh_keys: - fingerprints: - - "48:a0:87:54:ca:75:32:12:c6:9e:a2:77:a4:7a:08:a4" - - deploy: - name: Deploy Master to Heroku - command: | - if [ "${CIRCLE_BRANCH}" == "master" ]; then - git push heroku master - heroku run python manage.py deploy - heroku restart - fi + #- add_ssh_keys: + # fingerprints: + # - "48:a0:87:54:ca:75:32:12:c6:9e:a2:77:a4:7a:08:a4" + #- deploy: + # name: Deploy Master to Heroku + # command: | + # if [ "${CIRCLE_BRANCH}" == "master" ]; then + # git push heroku master + # heroku run python manage.py deploy + # heroku restart + # fi From 8afd9be5b1e2bd0f1054d0d872c7ae624577a457 Mon Sep 17 00:00:00 2001 From: "Kim, Hirokuni" Date: Wed, 24 May 2017 23:46:22 +0900 Subject: [PATCH 02/10] wip --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c5282fff..18706546 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,9 +22,9 @@ jobs: python3 -m venv venv . venv/bin/activate pip install -r requirements/dev.txt - - run: - name: setup Heroku - command: bash .circleci/setup-heroku.sh + #- run: + # name: setup Heroku + # command: bash .circleci/setup-heroku.sh - save_cache: key: deps1-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} paths: From 210d469b471f1df5b2649dba35a7e6b8604fb803 Mon Sep 17 00:00:00 2001 From: "Kim, Hirokuni" Date: Thu, 25 May 2017 11:38:06 +0900 Subject: [PATCH 03/10] wip --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 18706546..1e3ff16c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,6 +14,7 @@ jobs: POSTGRES_PASSWORD: "" - image: selenium/standalone-chrome:3.1.0 steps: + - run: ls -la /.circleci-task-data - checkout - restore_cache: key: deps1-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} From 8b6021dae800ec37b9afd26c643220a4f57d4c83 Mon Sep 17 00:00:00 2001 From: "Kim, Hirokuni" Date: Thu, 25 May 2017 11:40:28 +0900 Subject: [PATCH 04/10] wip --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1e3ff16c..af7ca5f1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: POSTGRES_PASSWORD: "" - image: selenium/standalone-chrome:3.1.0 steps: - - run: ls -la /.circleci-task-data + - run: find /.circleci-task-data - checkout - restore_cache: key: deps1-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} From 901412e945c393794871eee8e08f36843ec2766c Mon Sep 17 00:00:00 2001 From: "Kim, Hirokuni" Date: Fri, 16 Jun 2017 09:10:21 +0900 Subject: [PATCH 05/10] wip --- circle.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 circle.yml diff --git a/circle.yml b/circle.yml new file mode 100644 index 00000000..8ce4f026 --- /dev/null +++ b/circle.yml @@ -0,0 +1,22 @@ +mahine: + python: + version: 3.6.0 + + environment: + FLASK_CONFIG: testing + TEST_DATABASE_URL: postgresql://ubuntu@localhost/circle_test?sslmode=disable + +dependencies: + override: + - python3 -m venv venv; + - . venv/bin/activate; + - pip install -r requirements/dev.txt + - bash .circleci/setup-heroku.sh + +deployment: + production: + branch: 1.0-kim-test-heroku + commands: + - git push heroku master + - heroku run python manage.py deploy + - heroku restart From f72f55b9910aeb4ec5e4085d1bc00f2fec43b4ad Mon Sep 17 00:00:00 2001 From: "Kim, Hirokuni" Date: Fri, 16 Jun 2017 09:19:38 +0900 Subject: [PATCH 06/10] wip From 1924c8c30fca0057229a3f123b37af31ccee9b13 Mon Sep 17 00:00:00 2001 From: "Kim, Hirokuni" Date: Fri, 16 Jun 2017 09:20:49 +0900 Subject: [PATCH 07/10] wip --- .circleci/config.yml | 52 --------------------------------------- .circleci/setup-heroku.sh | 15 ----------- 2 files changed, 67 deletions(-) delete mode 100644 .circleci/config.yml delete mode 100644 .circleci/setup-heroku.sh diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index af7ca5f1..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,52 +0,0 @@ -version: 2 -jobs: - build: - working_directory: ~/circulate - docker: - - image: python:3.6.0 - environment: - FLASK_CONFIG: testing - TEST_DATABASE_URL: postgresql://ubuntu@localhost/circle_test?sslmode=disable - - image: postgres:9.6.2 - environment: - POSTGRES_USER: ubuntu - POSTGRES_DB: circle_test - POSTGRES_PASSWORD: "" - - image: selenium/standalone-chrome:3.1.0 - steps: - - run: find /.circleci-task-data - - checkout - - restore_cache: - key: deps1-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} - - run: - command: | - python3 -m venv venv - . venv/bin/activate - pip install -r requirements/dev.txt - #- run: - # name: setup Heroku - # command: bash .circleci/setup-heroku.sh - - save_cache: - key: deps1-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} - paths: - - "venv" - - run: - command: | - . venv/bin/activate - python manage.py test - - store_artifacts: - path: test-reports/ - destination: tr1 - - store_test_results: - path: test-reports/ - #- add_ssh_keys: - # fingerprints: - # - "48:a0:87:54:ca:75:32:12:c6:9e:a2:77:a4:7a:08:a4" - #- deploy: - # name: Deploy Master to Heroku - # command: | - # if [ "${CIRCLE_BRANCH}" == "master" ]; then - # git push heroku master - # heroku run python manage.py deploy - # heroku restart - # fi diff --git a/.circleci/setup-heroku.sh b/.circleci/setup-heroku.sh deleted file mode 100644 index 78a2c2f8..00000000 --- a/.circleci/setup-heroku.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -git remote add heroku https://git.heroku.com/cci-demo-walkthrough.git -wget https://cli-assets.heroku.com/branches/stable/heroku-linux-amd64.tar.gz -mkdir -p /usr/local/lib /usr/local/bin -tar -xvzf heroku-linux-amd64.tar.gz -C /usr/local/lib -ln -s /usr/local/lib/heroku/bin/heroku /usr/local/bin/heroku - -cat > ~/.netrc << EOF -machine api.heroku.com - login $HEROKU_LOGIN - password $HEROKU_API_KEY -machine git.heroku.com - login $HEROKU_LOGIN - password $HEROKU_API_KEY -EOF \ No newline at end of file From bdda423ce049544eb0f6621372aa65729435a32a Mon Sep 17 00:00:00 2001 From: "Kim, Hirokuni" Date: Fri, 16 Jun 2017 09:22:25 +0900 Subject: [PATCH 08/10] wip --- circle.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 8ce4f026..a58f2a95 100644 --- a/circle.yml +++ b/circle.yml @@ -7,9 +7,9 @@ mahine: TEST_DATABASE_URL: postgresql://ubuntu@localhost/circle_test?sslmode=disable dependencies: - override: - - python3 -m venv venv; - - . venv/bin/activate; + post: + #- python3 -m venv venv; + #- . venv/bin/activate; - pip install -r requirements/dev.txt - bash .circleci/setup-heroku.sh From ded9ec972abdfa801f80051447813bfdf06172a6 Mon Sep 17 00:00:00 2001 From: "Kim, Hirokuni" Date: Fri, 16 Jun 2017 09:24:55 +0900 Subject: [PATCH 09/10] Revert "wip" This reverts commit 1924c8c30fca0057229a3f123b37af31ccee9b13. --- .circleci/config.yml | 52 +++++++++++++++++++++++++++++++++++++++ .circleci/setup-heroku.sh | 15 +++++++++++ 2 files changed, 67 insertions(+) create mode 100644 .circleci/config.yml create mode 100644 .circleci/setup-heroku.sh diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 00000000..af7ca5f1 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,52 @@ +version: 2 +jobs: + build: + working_directory: ~/circulate + docker: + - image: python:3.6.0 + environment: + FLASK_CONFIG: testing + TEST_DATABASE_URL: postgresql://ubuntu@localhost/circle_test?sslmode=disable + - image: postgres:9.6.2 + environment: + POSTGRES_USER: ubuntu + POSTGRES_DB: circle_test + POSTGRES_PASSWORD: "" + - image: selenium/standalone-chrome:3.1.0 + steps: + - run: find /.circleci-task-data + - checkout + - restore_cache: + key: deps1-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} + - run: + command: | + python3 -m venv venv + . venv/bin/activate + pip install -r requirements/dev.txt + #- run: + # name: setup Heroku + # command: bash .circleci/setup-heroku.sh + - save_cache: + key: deps1-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} + paths: + - "venv" + - run: + command: | + . venv/bin/activate + python manage.py test + - store_artifacts: + path: test-reports/ + destination: tr1 + - store_test_results: + path: test-reports/ + #- add_ssh_keys: + # fingerprints: + # - "48:a0:87:54:ca:75:32:12:c6:9e:a2:77:a4:7a:08:a4" + #- deploy: + # name: Deploy Master to Heroku + # command: | + # if [ "${CIRCLE_BRANCH}" == "master" ]; then + # git push heroku master + # heroku run python manage.py deploy + # heroku restart + # fi diff --git a/.circleci/setup-heroku.sh b/.circleci/setup-heroku.sh new file mode 100644 index 00000000..78a2c2f8 --- /dev/null +++ b/.circleci/setup-heroku.sh @@ -0,0 +1,15 @@ +#!/bin/bash +git remote add heroku https://git.heroku.com/cci-demo-walkthrough.git +wget https://cli-assets.heroku.com/branches/stable/heroku-linux-amd64.tar.gz +mkdir -p /usr/local/lib /usr/local/bin +tar -xvzf heroku-linux-amd64.tar.gz -C /usr/local/lib +ln -s /usr/local/lib/heroku/bin/heroku /usr/local/bin/heroku + +cat > ~/.netrc << EOF +machine api.heroku.com + login $HEROKU_LOGIN + password $HEROKU_API_KEY +machine git.heroku.com + login $HEROKU_LOGIN + password $HEROKU_API_KEY +EOF \ No newline at end of file From 445fde34704176370d922d63d74effb2768960fd Mon Sep 17 00:00:00 2001 From: "Kim, Hirokuni" Date: Fri, 16 Jun 2017 09:25:04 +0900 Subject: [PATCH 10/10] wip --- .circleci/config.yml | 52 -------------------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index af7ca5f1..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,52 +0,0 @@ -version: 2 -jobs: - build: - working_directory: ~/circulate - docker: - - image: python:3.6.0 - environment: - FLASK_CONFIG: testing - TEST_DATABASE_URL: postgresql://ubuntu@localhost/circle_test?sslmode=disable - - image: postgres:9.6.2 - environment: - POSTGRES_USER: ubuntu - POSTGRES_DB: circle_test - POSTGRES_PASSWORD: "" - - image: selenium/standalone-chrome:3.1.0 - steps: - - run: find /.circleci-task-data - - checkout - - restore_cache: - key: deps1-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} - - run: - command: | - python3 -m venv venv - . venv/bin/activate - pip install -r requirements/dev.txt - #- run: - # name: setup Heroku - # command: bash .circleci/setup-heroku.sh - - save_cache: - key: deps1-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} - paths: - - "venv" - - run: - command: | - . venv/bin/activate - python manage.py test - - store_artifacts: - path: test-reports/ - destination: tr1 - - store_test_results: - path: test-reports/ - #- add_ssh_keys: - # fingerprints: - # - "48:a0:87:54:ca:75:32:12:c6:9e:a2:77:a4:7a:08:a4" - #- deploy: - # name: Deploy Master to Heroku - # command: | - # if [ "${CIRCLE_BRANCH}" == "master" ]; then - # git push heroku master - # heroku run python manage.py deploy - # heroku restart - # fi