From 13f4c21bd4c9f4036b5eb64e44130fcd8c2107ad Mon Sep 17 00:00:00 2001 From: LeanMachine97 <58107103+LeanMachine97@users.noreply.github.com> Date: Fri, 4 Sep 2020 14:06:24 +0800 Subject: [PATCH 01/23] added code coverage test for code climate --- .travis.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 826773f..dcb4caa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,19 +6,29 @@ python: install: - pip install -e . - pip install ."[tests]" + - pip install coverage + - pip install codeclimate-test-reporter before_script: - - py.test -s tests + - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter + - chmod +x ./cc-test-reporter + - ./cc-test-reporter before-build script: + - py.test --cov=tests + - codeclimate-test-reporter --file .coverage - ./build_docker.sh - ./publish_via_travis.sh +after_script: + - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT + services: - docker env: global: + - CC_TEST_REPORTER_ID =$TEST_REPORTER_ID - BUILD_TAG=$TRAVIS_TAG - secure: "baz4o5dPTHBnQ7lLq4uhSPwduSWkErr8v5d/TKJSTegzgh4TjIGLjdjwho07LjS76bDAnd96odTf5GQEm90oMh48vJowP1TzvDdzqkWRbr9j12SY78RMAKRA+v2ZuhA/ePpomFNcJ2R+3Cppezc5W3mXEMsKrkKSHGJL8TyjzJK/gT9OvojuZ4W/QLah7zXRhycihL+DQvHvwbGjzUbtVw4aqUA5R2ETlltAzyU7GCqEnjL4skMrXCoclJd6M8eCCLaZ4wjzWSOkwEcBMGLPUHtCs0+vOGf3oGeRugv2gaMYM70TUR4b6RrmZSkP3UjIA9niSKjySjaWQD7IWr681i39xI4ThQJicO+38C2c4sfQ6p4fTVkYOCOspH5RIC2jZCvLtTaJbl1+0I5eV+AMjmKcbeI4BN8NYl/NOzLtpWxkqaEz0DrtQIoHFD/b6xzsbqxBOkyNbzste2P9myaY3Xsfur8LntZFuT6SzbpV1DbLpoxWvfCcufsF+h9s4Wgd5ghS88TVBCfUcaTaz+g04XdaL+otfABPkLx9eDmGgLCpbGc2LG8qhM+lj1ub31BmroKv61eyQlRTcZeEL84lQ9aFYIjCgdKD14t2jjNkCdo1aVimN6rJjqbp0ju89HFYMDa861Hg6adZ2FNQ68ig4sCCLCZWKGIqFqaKZmL8uIQ=" - secure: "KOV1gCE4dZc+ujgsj24iPVyUfWBTJAJJB1nRDvQr9TEWuo4cdHM2r06r4jnJ7XX1594RW6PTe628ibOJCitcbXhphGuYG3IiWTbASmwsMla6NwJqc9fbfxwf1uEyHEBDNtf3Bcw1CnEH6eV1EjIelFOeypjY4llD3TVY8W3onyaGrzKKysUJGTaP1WutSN4VH/VNeVUPvQjxnkxS9ocC0Hq2emOiLh4xZE+5k9gE38HmlsOCKtlQVgJaKA3lyi9NFwd0oSlmqFQVqksrqxiQsDTg/EHl5GE7XfA8n6QfN8o8cNKmsL/+ErVNDiC4tMYNhUhv9jH0rnT/+027QhZc5ISQO4jd7SHvInB+gqzPZ5OXZ2jX5FFoblwM9QTqgSOhPfHTs1ta8BaWx4q3GgRYZSLbmI/lWMXI5llw/z9U0HTzGu2uQ5pS5S+T4IVz/kkg1cFiAT+cBqVZ62Q6B1ITA4gs3PEdQudyXE7y7lIN8riaR6uUwENDlo9mwk9R58+PSkKNgMD2jVv19AELjK3JGiItLi1SnvOAfjFv1aan+LHYmNWH1EeVPccxXheiocnKBuZd7uPN0SqdmrGAT+W5wKjJEHF/MNwY/7WZSDGOrgW33jgCiCE82xyTrKxueT1auH7BJomVYJ3mkvIM2+m6smi73Xw18Ud+cmegmGbqGyk=" From 9045290848f5b7d9278616370b1f22500470dc2a Mon Sep 17 00:00:00 2001 From: LeanMachine97 <58107103+LeanMachine97@users.noreply.github.com> Date: Fri, 4 Sep 2020 14:29:30 +0800 Subject: [PATCH 02/23] updated code coverage script --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dcb4caa..cc91f54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,13 +15,14 @@ before_script: - ./cc-test-reporter before-build script: - - py.test --cov=tests - - codeclimate-test-reporter --file .coverage + - py.test --cov=tests tests/ + - codeclimate-test-reporter --file .tests - ./build_docker.sh - ./publish_via_travis.sh after_script: - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT + - codeclimate-test-reporter --file services: - docker @@ -29,6 +30,7 @@ services: env: global: - CC_TEST_REPORTER_ID =$TEST_REPORTER_ID + - CODECLIMATE_REPO_TOKEN=[token] - BUILD_TAG=$TRAVIS_TAG - secure: "baz4o5dPTHBnQ7lLq4uhSPwduSWkErr8v5d/TKJSTegzgh4TjIGLjdjwho07LjS76bDAnd96odTf5GQEm90oMh48vJowP1TzvDdzqkWRbr9j12SY78RMAKRA+v2ZuhA/ePpomFNcJ2R+3Cppezc5W3mXEMsKrkKSHGJL8TyjzJK/gT9OvojuZ4W/QLah7zXRhycihL+DQvHvwbGjzUbtVw4aqUA5R2ETlltAzyU7GCqEnjL4skMrXCoclJd6M8eCCLaZ4wjzWSOkwEcBMGLPUHtCs0+vOGf3oGeRugv2gaMYM70TUR4b6RrmZSkP3UjIA9niSKjySjaWQD7IWr681i39xI4ThQJicO+38C2c4sfQ6p4fTVkYOCOspH5RIC2jZCvLtTaJbl1+0I5eV+AMjmKcbeI4BN8NYl/NOzLtpWxkqaEz0DrtQIoHFD/b6xzsbqxBOkyNbzste2P9myaY3Xsfur8LntZFuT6SzbpV1DbLpoxWvfCcufsF+h9s4Wgd5ghS88TVBCfUcaTaz+g04XdaL+otfABPkLx9eDmGgLCpbGc2LG8qhM+lj1ub31BmroKv61eyQlRTcZeEL84lQ9aFYIjCgdKD14t2jjNkCdo1aVimN6rJjqbp0ju89HFYMDa861Hg6adZ2FNQ68ig4sCCLCZWKGIqFqaKZmL8uIQ=" - secure: "KOV1gCE4dZc+ujgsj24iPVyUfWBTJAJJB1nRDvQr9TEWuo4cdHM2r06r4jnJ7XX1594RW6PTe628ibOJCitcbXhphGuYG3IiWTbASmwsMla6NwJqc9fbfxwf1uEyHEBDNtf3Bcw1CnEH6eV1EjIelFOeypjY4llD3TVY8W3onyaGrzKKysUJGTaP1WutSN4VH/VNeVUPvQjxnkxS9ocC0Hq2emOiLh4xZE+5k9gE38HmlsOCKtlQVgJaKA3lyi9NFwd0oSlmqFQVqksrqxiQsDTg/EHl5GE7XfA8n6QfN8o8cNKmsL/+ErVNDiC4tMYNhUhv9jH0rnT/+027QhZc5ISQO4jd7SHvInB+gqzPZ5OXZ2jX5FFoblwM9QTqgSOhPfHTs1ta8BaWx4q3GgRYZSLbmI/lWMXI5llw/z9U0HTzGu2uQ5pS5S+T4IVz/kkg1cFiAT+cBqVZ62Q6B1ITA4gs3PEdQudyXE7y7lIN8riaR6uUwENDlo9mwk9R58+PSkKNgMD2jVv19AELjK3JGiItLi1SnvOAfjFv1aan+LHYmNWH1EeVPccxXheiocnKBuZd7uPN0SqdmrGAT+W5wKjJEHF/MNwY/7WZSDGOrgW33jgCiCE82xyTrKxueT1auH7BJomVYJ3mkvIM2+m6smi73Xw18Ud+cmegmGbqGyk=" From 2fe2ed6e77c7d9eec20de79376d16a11cdee3648 Mon Sep 17 00:00:00 2001 From: LeanMachine97 <58107103+LeanMachine97@users.noreply.github.com> Date: Fri, 4 Sep 2020 14:36:55 +0800 Subject: [PATCH 03/23] added pytest-cov installation script --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index cc91f54..17fd42c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ install: - pip install ."[tests]" - pip install coverage - pip install codeclimate-test-reporter + - pip install pytest-cov before_script: - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter From 5521f48ac2653beea833e2cd94d9aa0f25566cb3 Mon Sep 17 00:00:00 2001 From: LeanMachine97 <58107103+LeanMachine97@users.noreply.github.com> Date: Fri, 4 Sep 2020 14:43:51 +0800 Subject: [PATCH 04/23] updated code coverage configuration --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 17fd42c..c5207c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,6 @@ before_script: script: - py.test --cov=tests tests/ - - codeclimate-test-reporter --file .tests - ./build_docker.sh - ./publish_via_travis.sh From 4760125c9a8d82d80e0f293171e9d36c96d5bbf3 Mon Sep 17 00:00:00 2001 From: SEAL369 <51356558+SEAL369@users.noreply.github.com> Date: Fri, 4 Sep 2020 16:45:38 +0800 Subject: [PATCH 05/23] Update contributing.md According to the sources from Google, it should be GCP chatops instead of GCP chatopcy. --- docs/contributing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/contributing.md b/docs/contributing.md index c337e49..281f844 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -16,7 +16,7 @@ Development Setup HubCommander is a Python 3 application, and as such, having a good Python 3 environment up and running is essential. Google has very good documentation on setting up a Python environment [here](https://cloud.google.com/python/setup). -(You don't need to set up the Google Cloud dependencies -- unless you want to do really cool GCP chatopcy things with HubCommander.) +(You don't need to set up the Google Cloud dependencies -- unless you want to do really cool GCP chatops things with HubCommander.) You will also need to install `git`. Some good guides on `git` can be found [here](https://git-scm.com/documentation). From fad0859bc2f4ed34f1243cdf386c8f32c115cf72 Mon Sep 17 00:00:00 2001 From: ShiTing111 Date: Fri, 4 Sep 2020 17:18:05 +0800 Subject: [PATCH 06/23] Update test-requirements.txt --- test-requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test-requirements.txt b/test-requirements.txt index 65b1ff4..2b1c649 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,2 +1,3 @@ pytest==3.0.6 slackclient==1.0.5 +This is testing. From f39cff3ce155207624e87ae34343470d3a6ef2e5 Mon Sep 17 00:00:00 2001 From: ShiTing111 Date: Fri, 4 Sep 2020 17:18:22 +0800 Subject: [PATCH 07/23] Update test-requirements.txt --- test-requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 2b1c649..65b1ff4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,3 +1,2 @@ pytest==3.0.6 slackclient==1.0.5 -This is testing. From fd1e3d77f407230784a970c11bcbfebc5a0c5833 Mon Sep 17 00:00:00 2001 From: ShiTing99 <70758044+ShiTing99@users.noreply.github.com> Date: Sat, 5 Sep 2020 17:55:54 +0800 Subject: [PATCH 08/23] Update the test coverage settings for code climate --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c5207c0..f82080d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,20 +16,22 @@ before_script: - ./cc-test-reporter before-build script: - - py.test --cov=tests tests/ - ./build_docker.sh - ./publish_via_travis.sh + - py.test --cov=tests tests/ + - coverage json after_script: - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT - - codeclimate-test-reporter --file + - ./cc-test-reporter format-coverage -t coverage.py + - ./cc-test-reporter upload-coverage services: - docker env: global: - - CC_TEST_REPORTER_ID =$TEST_REPORTER_ID + - CC_TEST_REPORTER_ID=$TEST_REPORTER_ID - CODECLIMATE_REPO_TOKEN=[token] - BUILD_TAG=$TRAVIS_TAG - secure: "baz4o5dPTHBnQ7lLq4uhSPwduSWkErr8v5d/TKJSTegzgh4TjIGLjdjwho07LjS76bDAnd96odTf5GQEm90oMh48vJowP1TzvDdzqkWRbr9j12SY78RMAKRA+v2ZuhA/ePpomFNcJ2R+3Cppezc5W3mXEMsKrkKSHGJL8TyjzJK/gT9OvojuZ4W/QLah7zXRhycihL+DQvHvwbGjzUbtVw4aqUA5R2ETlltAzyU7GCqEnjL4skMrXCoclJd6M8eCCLaZ4wjzWSOkwEcBMGLPUHtCs0+vOGf3oGeRugv2gaMYM70TUR4b6RrmZSkP3UjIA9niSKjySjaWQD7IWr681i39xI4ThQJicO+38C2c4sfQ6p4fTVkYOCOspH5RIC2jZCvLtTaJbl1+0I5eV+AMjmKcbeI4BN8NYl/NOzLtpWxkqaEz0DrtQIoHFD/b6xzsbqxBOkyNbzste2P9myaY3Xsfur8LntZFuT6SzbpV1DbLpoxWvfCcufsF+h9s4Wgd5ghS88TVBCfUcaTaz+g04XdaL+otfABPkLx9eDmGgLCpbGc2LG8qhM+lj1ub31BmroKv61eyQlRTcZeEL84lQ9aFYIjCgdKD14t2jjNkCdo1aVimN6rJjqbp0ju89HFYMDa861Hg6adZ2FNQ68ig4sCCLCZWKGIqFqaKZmL8uIQ=" From c51e73813386d1296d4fa18feb89ae88f36eb6d5 Mon Sep 17 00:00:00 2001 From: LeanMachine97 <58107103+LeanMachine97@users.noreply.github.com> Date: Sat, 5 Sep 2020 18:20:43 +0800 Subject: [PATCH 09/23] Updated code climate configuration --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f82080d..32ccced 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ services: env: global: - - CC_TEST_REPORTER_ID=$TEST_REPORTER_ID + - CC_TEST_REPORTER_ID="395e3b14e59599c44395c87bbc181c48880855b4adaf71d5f3c99a00365a7b9f" - CODECLIMATE_REPO_TOKEN=[token] - BUILD_TAG=$TRAVIS_TAG - secure: "baz4o5dPTHBnQ7lLq4uhSPwduSWkErr8v5d/TKJSTegzgh4TjIGLjdjwho07LjS76bDAnd96odTf5GQEm90oMh48vJowP1TzvDdzqkWRbr9j12SY78RMAKRA+v2ZuhA/ePpomFNcJ2R+3Cppezc5W3mXEMsKrkKSHGJL8TyjzJK/gT9OvojuZ4W/QLah7zXRhycihL+DQvHvwbGjzUbtVw4aqUA5R2ETlltAzyU7GCqEnjL4skMrXCoclJd6M8eCCLaZ4wjzWSOkwEcBMGLPUHtCs0+vOGf3oGeRugv2gaMYM70TUR4b6RrmZSkP3UjIA9niSKjySjaWQD7IWr681i39xI4ThQJicO+38C2c4sfQ6p4fTVkYOCOspH5RIC2jZCvLtTaJbl1+0I5eV+AMjmKcbeI4BN8NYl/NOzLtpWxkqaEz0DrtQIoHFD/b6xzsbqxBOkyNbzste2P9myaY3Xsfur8LntZFuT6SzbpV1DbLpoxWvfCcufsF+h9s4Wgd5ghS88TVBCfUcaTaz+g04XdaL+otfABPkLx9eDmGgLCpbGc2LG8qhM+lj1ub31BmroKv61eyQlRTcZeEL84lQ9aFYIjCgdKD14t2jjNkCdo1aVimN6rJjqbp0ju89HFYMDa861Hg6adZ2FNQ68ig4sCCLCZWKGIqFqaKZmL8uIQ=" From bea220198ea52ec8f4d89d5c2e54a6a8715d51e6 Mon Sep 17 00:00:00 2001 From: LeanMachine97 <58107103+LeanMachine97@users.noreply.github.com> Date: Sat, 5 Sep 2020 18:28:51 +0800 Subject: [PATCH 10/23] Update .travis.yml --- .travis.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 32ccced..c84f2a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,22 +16,23 @@ before_script: - ./cc-test-reporter before-build script: - - ./build_docker.sh - - ./publish_via_travis.sh - py.test --cov=tests tests/ - - coverage json - + - coverage help + - coverage xml + after_script: - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT - - ./cc-test-reporter format-coverage -t coverage.py - - ./cc-test-reporter upload-coverage + - ./cc-test-reporter format-coverage -t simplecov -o coverage/codeclimate.backend.json coverage/backend/.resultset.json # Format backend coverage + - ./cc-test-reporter format-coverage -t lcov -o coverage/codeclimate.frontend.json coverage/frontend/lcov.info # Format frontend coverage + - ./cc-test-reporter sum-coverage coverage/codeclimate.*.json -p 2 # Sum both coverage parts into coverage/codeclimate.json + - if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then ./cc-test-reporter upload-coverage --a199ef9c62ad2ca8c1f520bfe950eeeda67ed4ad08ece334514a0244a1da9ff2; fi # Upload coverage/codeclimate.json services: - docker env: global: - - CC_TEST_REPORTER_ID="395e3b14e59599c44395c87bbc181c48880855b4adaf71d5f3c99a00365a7b9f" + - CC_TEST_REPORTER_ID=a199ef9c62ad2ca8c1f520bfe950eeeda67ed4ad08ece334514a0244a1da9ff2 - CODECLIMATE_REPO_TOKEN=[token] - BUILD_TAG=$TRAVIS_TAG - secure: "baz4o5dPTHBnQ7lLq4uhSPwduSWkErr8v5d/TKJSTegzgh4TjIGLjdjwho07LjS76bDAnd96odTf5GQEm90oMh48vJowP1TzvDdzqkWRbr9j12SY78RMAKRA+v2ZuhA/ePpomFNcJ2R+3Cppezc5W3mXEMsKrkKSHGJL8TyjzJK/gT9OvojuZ4W/QLah7zXRhycihL+DQvHvwbGjzUbtVw4aqUA5R2ETlltAzyU7GCqEnjL4skMrXCoclJd6M8eCCLaZ4wjzWSOkwEcBMGLPUHtCs0+vOGf3oGeRugv2gaMYM70TUR4b6RrmZSkP3UjIA9niSKjySjaWQD7IWr681i39xI4ThQJicO+38C2c4sfQ6p4fTVkYOCOspH5RIC2jZCvLtTaJbl1+0I5eV+AMjmKcbeI4BN8NYl/NOzLtpWxkqaEz0DrtQIoHFD/b6xzsbqxBOkyNbzste2P9myaY3Xsfur8LntZFuT6SzbpV1DbLpoxWvfCcufsF+h9s4Wgd5ghS88TVBCfUcaTaz+g04XdaL+otfABPkLx9eDmGgLCpbGc2LG8qhM+lj1ub31BmroKv61eyQlRTcZeEL84lQ9aFYIjCgdKD14t2jjNkCdo1aVimN6rJjqbp0ju89HFYMDa861Hg6adZ2FNQ68ig4sCCLCZWKGIqFqaKZmL8uIQ=" From 7bf70c2ab4a040a33978e66fbe773fccf2f3fd7a Mon Sep 17 00:00:00 2001 From: LeanMachine97 <58107103+LeanMachine97@users.noreply.github.com> Date: Sat, 5 Sep 2020 18:29:24 +0800 Subject: [PATCH 11/23] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c84f2a7..d2f3f69 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ services: env: global: - - CC_TEST_REPORTER_ID=a199ef9c62ad2ca8c1f520bfe950eeeda67ed4ad08ece334514a0244a1da9ff2 + - CC_TEST_REPORTER_ID=$TEST_REPORTER_ID - CODECLIMATE_REPO_TOKEN=[token] - BUILD_TAG=$TRAVIS_TAG - secure: "baz4o5dPTHBnQ7lLq4uhSPwduSWkErr8v5d/TKJSTegzgh4TjIGLjdjwho07LjS76bDAnd96odTf5GQEm90oMh48vJowP1TzvDdzqkWRbr9j12SY78RMAKRA+v2ZuhA/ePpomFNcJ2R+3Cppezc5W3mXEMsKrkKSHGJL8TyjzJK/gT9OvojuZ4W/QLah7zXRhycihL+DQvHvwbGjzUbtVw4aqUA5R2ETlltAzyU7GCqEnjL4skMrXCoclJd6M8eCCLaZ4wjzWSOkwEcBMGLPUHtCs0+vOGf3oGeRugv2gaMYM70TUR4b6RrmZSkP3UjIA9niSKjySjaWQD7IWr681i39xI4ThQJicO+38C2c4sfQ6p4fTVkYOCOspH5RIC2jZCvLtTaJbl1+0I5eV+AMjmKcbeI4BN8NYl/NOzLtpWxkqaEz0DrtQIoHFD/b6xzsbqxBOkyNbzste2P9myaY3Xsfur8LntZFuT6SzbpV1DbLpoxWvfCcufsF+h9s4Wgd5ghS88TVBCfUcaTaz+g04XdaL+otfABPkLx9eDmGgLCpbGc2LG8qhM+lj1ub31BmroKv61eyQlRTcZeEL84lQ9aFYIjCgdKD14t2jjNkCdo1aVimN6rJjqbp0ju89HFYMDa861Hg6adZ2FNQ68ig4sCCLCZWKGIqFqaKZmL8uIQ=" From 46c5939ed7505f5de584517a5cd9965c49e75459 Mon Sep 17 00:00:00 2001 From: ShiTing99 <70758044+ShiTing99@users.noreply.github.com> Date: Sat, 5 Sep 2020 18:56:45 +0800 Subject: [PATCH 12/23] Update .travis.yml --- .travis.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index d2f3f69..5c86e94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,16 +17,11 @@ before_script: script: - py.test --cov=tests tests/ - - coverage help - coverage xml after_script: - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT - - ./cc-test-reporter format-coverage -t simplecov -o coverage/codeclimate.backend.json coverage/backend/.resultset.json # Format backend coverage - - ./cc-test-reporter format-coverage -t lcov -o coverage/codeclimate.frontend.json coverage/frontend/lcov.info # Format frontend coverage - - ./cc-test-reporter sum-coverage coverage/codeclimate.*.json -p 2 # Sum both coverage parts into coverage/codeclimate.json - - if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then ./cc-test-reporter upload-coverage --a199ef9c62ad2ca8c1f520bfe950eeeda67ed4ad08ece334514a0244a1da9ff2; fi # Upload coverage/codeclimate.json - + services: - docker From 784d0ad19a03e3fa7d0845fb766c29af36d32c10 Mon Sep 17 00:00:00 2001 From: LeanMachine97 <58107103+LeanMachine97@users.noreply.github.com> Date: Sat, 5 Sep 2020 23:55:10 +0800 Subject: [PATCH 13/23] Added deployment configuration to dockerhub --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5c86e94..5ea6add 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,9 @@ language: python python: - "3.6" +before_install: + - docker image build -t ${IMGNAME} . + install: - pip install -e . - pip install ."[tests]" @@ -22,6 +25,9 @@ script: after_script: - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT +after_successful: + - docker image build -t ${IMGNAME} ${INSTALL_LOCATION}/. && docker push ${IMGNAME} && docker stop discordbot; docker rm discordbot; docker run --name discordbot -d -e TOKEN=${TOKEN} ${IMGNAME}" + services: - docker From a12351a357b8916bb40b4718ecdac3af1728d982 Mon Sep 17 00:00:00 2001 From: LeanMachine97 <58107103+LeanMachine97@users.noreply.github.com> Date: Sun, 6 Sep 2020 00:02:17 +0800 Subject: [PATCH 14/23] Updated deployment to dockerhub configuration --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5ea6add..468b80e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,10 @@ after_script: - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT after_successful: - - docker image build -t ${IMGNAME} ${INSTALL_LOCATION}/. && docker push ${IMGNAME} && docker stop discordbot; docker rm discordbot; docker run --name discordbot -d -e TOKEN=${TOKEN} ${IMGNAME}" + - docker login -u ${DHUB_USERNAME} -p ${DHUB_PASS} + - echo "${SSH_KEY}" | base64 --decode > /tmp/ssh_rsa + - chmod 600 /tmp/ssh_rsa + - ssh -o "StrictHostKeyChecking no" pi@${IPADDR} -i /tmp/ssh_rsa "cd ${INSTALL_LOCATION} && git pull ${TRAVIS_BUILD_WEB_URL} && docker image build -t ${IMGNAME} ${INSTALL_LOCATION}/. && docker push ${IMGNAME} && docker stop hubcommander; docker rm hubcommander; docker run --name hubcommander -d -e TOKEN=${TOKEN} ${IMGNAME}" services: - docker From 829842d880fad61c9ccc26d4eb4d4708453b9ea5 Mon Sep 17 00:00:00 2001 From: LeanMachine97 <58107103+LeanMachine97@users.noreply.github.com> Date: Sun, 6 Sep 2020 00:14:56 +0800 Subject: [PATCH 15/23] Update .travis.yml --- .travis.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 468b80e..90ee5d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,6 @@ language: python python: - "3.6" -before_install: - - docker image build -t ${IMGNAME} . - install: - pip install -e . - pip install ."[tests]" @@ -26,11 +23,8 @@ after_script: - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT after_successful: - - docker login -u ${DHUB_USERNAME} -p ${DHUB_PASS} - - echo "${SSH_KEY}" | base64 --decode > /tmp/ssh_rsa - - chmod 600 /tmp/ssh_rsa - - ssh -o "StrictHostKeyChecking no" pi@${IPADDR} -i /tmp/ssh_rsa "cd ${INSTALL_LOCATION} && git pull ${TRAVIS_BUILD_WEB_URL} && docker image build -t ${IMGNAME} ${INSTALL_LOCATION}/. && docker push ${IMGNAME} && docker stop hubcommander; docker rm hubcommander; docker run --name hubcommander -d -e TOKEN=${TOKEN} ${IMGNAME}" - + - docker build -t LeanMachine97/hubcommander . + services: - docker From 0afaf1959968f41219bdf229c0ce5631c0556858 Mon Sep 17 00:00:00 2001 From: LeanMachine97 <58107103+LeanMachine97@users.noreply.github.com> Date: Sun, 6 Sep 2020 00:19:30 +0800 Subject: [PATCH 16/23] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 90ee5d7..cc8c699 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ after_script: - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT after_successful: - - docker build -t LeanMachine97/hubcommander . + - docker build -t leanmachine97/hubcommander . services: - docker From 8bdd04b9db6e6a7f1de2b7a6e54a0817b8f874de Mon Sep 17 00:00:00 2001 From: LeanMachine97 <58107103+LeanMachine97@users.noreply.github.com> Date: Sun, 6 Sep 2020 00:57:42 +0800 Subject: [PATCH 17/23] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index cc8c699..da5a2a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,3 +35,4 @@ env: - BUILD_TAG=$TRAVIS_TAG - secure: "baz4o5dPTHBnQ7lLq4uhSPwduSWkErr8v5d/TKJSTegzgh4TjIGLjdjwho07LjS76bDAnd96odTf5GQEm90oMh48vJowP1TzvDdzqkWRbr9j12SY78RMAKRA+v2ZuhA/ePpomFNcJ2R+3Cppezc5W3mXEMsKrkKSHGJL8TyjzJK/gT9OvojuZ4W/QLah7zXRhycihL+DQvHvwbGjzUbtVw4aqUA5R2ETlltAzyU7GCqEnjL4skMrXCoclJd6M8eCCLaZ4wjzWSOkwEcBMGLPUHtCs0+vOGf3oGeRugv2gaMYM70TUR4b6RrmZSkP3UjIA9niSKjySjaWQD7IWr681i39xI4ThQJicO+38C2c4sfQ6p4fTVkYOCOspH5RIC2jZCvLtTaJbl1+0I5eV+AMjmKcbeI4BN8NYl/NOzLtpWxkqaEz0DrtQIoHFD/b6xzsbqxBOkyNbzste2P9myaY3Xsfur8LntZFuT6SzbpV1DbLpoxWvfCcufsF+h9s4Wgd5ghS88TVBCfUcaTaz+g04XdaL+otfABPkLx9eDmGgLCpbGc2LG8qhM+lj1ub31BmroKv61eyQlRTcZeEL84lQ9aFYIjCgdKD14t2jjNkCdo1aVimN6rJjqbp0ju89HFYMDa861Hg6adZ2FNQ68ig4sCCLCZWKGIqFqaKZmL8uIQ=" - secure: "KOV1gCE4dZc+ujgsj24iPVyUfWBTJAJJB1nRDvQr9TEWuo4cdHM2r06r4jnJ7XX1594RW6PTe628ibOJCitcbXhphGuYG3IiWTbASmwsMla6NwJqc9fbfxwf1uEyHEBDNtf3Bcw1CnEH6eV1EjIelFOeypjY4llD3TVY8W3onyaGrzKKysUJGTaP1WutSN4VH/VNeVUPvQjxnkxS9ocC0Hq2emOiLh4xZE+5k9gE38HmlsOCKtlQVgJaKA3lyi9NFwd0oSlmqFQVqksrqxiQsDTg/EHl5GE7XfA8n6QfN8o8cNKmsL/+ErVNDiC4tMYNhUhv9jH0rnT/+027QhZc5ISQO4jd7SHvInB+gqzPZ5OXZ2jX5FFoblwM9QTqgSOhPfHTs1ta8BaWx4q3GgRYZSLbmI/lWMXI5llw/z9U0HTzGu2uQ5pS5S+T4IVz/kkg1cFiAT+cBqVZ62Q6B1ITA4gs3PEdQudyXE7y7lIN8riaR6uUwENDlo9mwk9R58+PSkKNgMD2jVv19AELjK3JGiItLi1SnvOAfjFv1aan+LHYmNWH1EeVPccxXheiocnKBuZd7uPN0SqdmrGAT+W5wKjJEHF/MNwY/7WZSDGOrgW33jgCiCE82xyTrKxueT1auH7BJomVYJ3mkvIM2+m6smi73Xw18Ud+cmegmGbqGyk=" + From ad92e141e23095c4e71e81283da45d55f66c4921 Mon Sep 17 00:00:00 2001 From: ShiTing99 <70758044+ShiTing99@users.noreply.github.com> Date: Sun, 6 Sep 2020 01:02:08 +0800 Subject: [PATCH 18/23] Update test-requirements.txt From 59fac542153f9846998c93edd29751f64eb13fbd Mon Sep 17 00:00:00 2001 From: ShiTing99 <70758044+ShiTing99@users.noreply.github.com> Date: Sun, 6 Sep 2020 01:13:04 +0800 Subject: [PATCH 19/23] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index da5a2a5..cc8c699 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,4 +35,3 @@ env: - BUILD_TAG=$TRAVIS_TAG - secure: "baz4o5dPTHBnQ7lLq4uhSPwduSWkErr8v5d/TKJSTegzgh4TjIGLjdjwho07LjS76bDAnd96odTf5GQEm90oMh48vJowP1TzvDdzqkWRbr9j12SY78RMAKRA+v2ZuhA/ePpomFNcJ2R+3Cppezc5W3mXEMsKrkKSHGJL8TyjzJK/gT9OvojuZ4W/QLah7zXRhycihL+DQvHvwbGjzUbtVw4aqUA5R2ETlltAzyU7GCqEnjL4skMrXCoclJd6M8eCCLaZ4wjzWSOkwEcBMGLPUHtCs0+vOGf3oGeRugv2gaMYM70TUR4b6RrmZSkP3UjIA9niSKjySjaWQD7IWr681i39xI4ThQJicO+38C2c4sfQ6p4fTVkYOCOspH5RIC2jZCvLtTaJbl1+0I5eV+AMjmKcbeI4BN8NYl/NOzLtpWxkqaEz0DrtQIoHFD/b6xzsbqxBOkyNbzste2P9myaY3Xsfur8LntZFuT6SzbpV1DbLpoxWvfCcufsF+h9s4Wgd5ghS88TVBCfUcaTaz+g04XdaL+otfABPkLx9eDmGgLCpbGc2LG8qhM+lj1ub31BmroKv61eyQlRTcZeEL84lQ9aFYIjCgdKD14t2jjNkCdo1aVimN6rJjqbp0ju89HFYMDa861Hg6adZ2FNQ68ig4sCCLCZWKGIqFqaKZmL8uIQ=" - secure: "KOV1gCE4dZc+ujgsj24iPVyUfWBTJAJJB1nRDvQr9TEWuo4cdHM2r06r4jnJ7XX1594RW6PTe628ibOJCitcbXhphGuYG3IiWTbASmwsMla6NwJqc9fbfxwf1uEyHEBDNtf3Bcw1CnEH6eV1EjIelFOeypjY4llD3TVY8W3onyaGrzKKysUJGTaP1WutSN4VH/VNeVUPvQjxnkxS9ocC0Hq2emOiLh4xZE+5k9gE38HmlsOCKtlQVgJaKA3lyi9NFwd0oSlmqFQVqksrqxiQsDTg/EHl5GE7XfA8n6QfN8o8cNKmsL/+ErVNDiC4tMYNhUhv9jH0rnT/+027QhZc5ISQO4jd7SHvInB+gqzPZ5OXZ2jX5FFoblwM9QTqgSOhPfHTs1ta8BaWx4q3GgRYZSLbmI/lWMXI5llw/z9U0HTzGu2uQ5pS5S+T4IVz/kkg1cFiAT+cBqVZ62Q6B1ITA4gs3PEdQudyXE7y7lIN8riaR6uUwENDlo9mwk9R58+PSkKNgMD2jVv19AELjK3JGiItLi1SnvOAfjFv1aan+LHYmNWH1EeVPccxXheiocnKBuZd7uPN0SqdmrGAT+W5wKjJEHF/MNwY/7WZSDGOrgW33jgCiCE82xyTrKxueT1auH7BJomVYJ3mkvIM2+m6smi73Xw18Ud+cmegmGbqGyk=" - From c91a1584e9acf93f8fbd54a426fed6534a4ccf1d Mon Sep 17 00:00:00 2001 From: LeanMachine97 <58107103+LeanMachine97@users.noreply.github.com> Date: Sun, 6 Sep 2020 01:21:27 +0800 Subject: [PATCH 20/23] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index cc8c699..da5a2a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,3 +35,4 @@ env: - BUILD_TAG=$TRAVIS_TAG - secure: "baz4o5dPTHBnQ7lLq4uhSPwduSWkErr8v5d/TKJSTegzgh4TjIGLjdjwho07LjS76bDAnd96odTf5GQEm90oMh48vJowP1TzvDdzqkWRbr9j12SY78RMAKRA+v2ZuhA/ePpomFNcJ2R+3Cppezc5W3mXEMsKrkKSHGJL8TyjzJK/gT9OvojuZ4W/QLah7zXRhycihL+DQvHvwbGjzUbtVw4aqUA5R2ETlltAzyU7GCqEnjL4skMrXCoclJd6M8eCCLaZ4wjzWSOkwEcBMGLPUHtCs0+vOGf3oGeRugv2gaMYM70TUR4b6RrmZSkP3UjIA9niSKjySjaWQD7IWr681i39xI4ThQJicO+38C2c4sfQ6p4fTVkYOCOspH5RIC2jZCvLtTaJbl1+0I5eV+AMjmKcbeI4BN8NYl/NOzLtpWxkqaEz0DrtQIoHFD/b6xzsbqxBOkyNbzste2P9myaY3Xsfur8LntZFuT6SzbpV1DbLpoxWvfCcufsF+h9s4Wgd5ghS88TVBCfUcaTaz+g04XdaL+otfABPkLx9eDmGgLCpbGc2LG8qhM+lj1ub31BmroKv61eyQlRTcZeEL84lQ9aFYIjCgdKD14t2jjNkCdo1aVimN6rJjqbp0ju89HFYMDa861Hg6adZ2FNQ68ig4sCCLCZWKGIqFqaKZmL8uIQ=" - secure: "KOV1gCE4dZc+ujgsj24iPVyUfWBTJAJJB1nRDvQr9TEWuo4cdHM2r06r4jnJ7XX1594RW6PTe628ibOJCitcbXhphGuYG3IiWTbASmwsMla6NwJqc9fbfxwf1uEyHEBDNtf3Bcw1CnEH6eV1EjIelFOeypjY4llD3TVY8W3onyaGrzKKysUJGTaP1WutSN4VH/VNeVUPvQjxnkxS9ocC0Hq2emOiLh4xZE+5k9gE38HmlsOCKtlQVgJaKA3lyi9NFwd0oSlmqFQVqksrqxiQsDTg/EHl5GE7XfA8n6QfN8o8cNKmsL/+ErVNDiC4tMYNhUhv9jH0rnT/+027QhZc5ISQO4jd7SHvInB+gqzPZ5OXZ2jX5FFoblwM9QTqgSOhPfHTs1ta8BaWx4q3GgRYZSLbmI/lWMXI5llw/z9U0HTzGu2uQ5pS5S+T4IVz/kkg1cFiAT+cBqVZ62Q6B1ITA4gs3PEdQudyXE7y7lIN8riaR6uUwENDlo9mwk9R58+PSkKNgMD2jVv19AELjK3JGiItLi1SnvOAfjFv1aan+LHYmNWH1EeVPccxXheiocnKBuZd7uPN0SqdmrGAT+W5wKjJEHF/MNwY/7WZSDGOrgW33jgCiCE82xyTrKxueT1auH7BJomVYJ3mkvIM2+m6smi73Xw18Ud+cmegmGbqGyk=" + From 035f7e9e35c54eb12e2dfadfbd69298fde9567db Mon Sep 17 00:00:00 2001 From: LeanMachine97 <58107103+LeanMachine97@users.noreply.github.com> Date: Sun, 6 Sep 2020 02:12:36 +0800 Subject: [PATCH 21/23] Update .travis.yml added: - py.test -s tests - ./build_docker.sh --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index da5a2a5..1e8d200 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,14 +16,13 @@ before_script: - ./cc-test-reporter before-build script: + - py.test -s tests - py.test --cov=tests tests/ - coverage xml - + - ./build_docker.sh + after_script: - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT - -after_successful: - - docker build -t leanmachine97/hubcommander . services: - docker From 5a7d11d0c865ac07145987cc8440cf4c0916752d Mon Sep 17 00:00:00 2001 From: LeanMachine97 <58107103+LeanMachine97@users.noreply.github.com> Date: Sun, 6 Sep 2020 04:16:59 +0800 Subject: [PATCH 22/23] Create deploy.sh to deploy to Dockerhub --- deploy.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 deploy.sh diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 0000000..9e7044b --- /dev/null +++ b/deploy.sh @@ -0,0 +1,3 @@ +#!/bin/bash +echo "$DHUB_PASS" | docker login -u "$DHUB_USERNAME" --password-stdin +docker push seanngan7/hubcommander From 1e635d9c75ca56002a35e06718956276b6d837d3 Mon Sep 17 00:00:00 2001 From: LeanMachine97 <58107103+LeanMachine97@users.noreply.github.com> Date: Sun, 6 Sep 2020 04:17:21 +0800 Subject: [PATCH 23/23] Update .travis.yml --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1e8d200..23a06c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,13 @@ script: - coverage xml - ./build_docker.sh +deploy: + # Build Docker container and push to Docker Hub + provider: script + script: bash deploy.sh + on: + branch: develop4 + after_script: - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT