From 7bd3a3df11c254365675f318b811e21e95af9bf0 Mon Sep 17 00:00:00 2001 From: Liu Dong Date: Mon, 20 Nov 2017 10:33:57 +0800 Subject: [PATCH 01/19] for travis ci --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cf3729d73..c045b71fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ # # This work is licensed under the terms of the GNU GPL, version 2. See # the COPYING file in the top-level directory. -# +# Don't konw whether it can be changed. language: c @@ -51,8 +51,8 @@ script: addons: coverity_scan: project: - name: "siemens/jailhouse" - notification_email: jan.kiszka@siemens.com + name: "beyond/jailhouse" + notification_email: beyond2002@gmail.com build_script_url: https://raw.githubusercontent.com/$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH/ci/coverity-scan-build.sh build_command_prepend: "cov-configure --comptype gcc --compiler arm-linux-gnueabihf-gcc --template; cov-configure --comptype gcc --compiler aarch64-linux-gnu-gcc --template" build_command: "unused" From 0687c6c5fc56a067a5adec588edf0153aed314d6 Mon Sep 17 00:00:00 2001 From: Liu Dong Date: Mon, 20 Nov 2017 11:52:57 +0800 Subject: [PATCH 02/19] Add deploy config --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index c045b71fb..ee1901b0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,3 +57,11 @@ addons: build_command_prepend: "cov-configure --comptype gcc --compiler arm-linux-gnueabihf-gcc --template; cov-configure --comptype gcc --compiler aarch64-linux-gnu-gcc --template" build_command: "unused" branch_pattern: coverity_scan.* + +deploy: + provider: pages + skip_cleanup: true + github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard + on: + branch: tmp + From 8d161b4381a08c9ad9074de1a37662f966effa69 Mon Sep 17 00:00:00 2001 From: Liu Dong Date: Mon, 20 Nov 2017 15:36:42 +0800 Subject: [PATCH 03/19] add fold script for solve log file size bigger than 4M --- .travis.yml | 3 +++ scripts/script_with_folds.sh | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 scripts/script_with_folds.sh diff --git a/.travis.yml b/.travis.yml index ee1901b0c..bcfc33b6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,7 @@ script: - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then ci/build-all-configs.sh; fi + - ./scripts/script_with_folds.sh addons: coverity_scan: @@ -58,10 +59,12 @@ addons: build_command: "unused" branch_pattern: coverity_scan.* + travis_fold:start:foo deploy: provider: pages skip_cleanup: true github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard on: branch: tmp + travis_fold:end:foo diff --git a/scripts/script_with_folds.sh b/scripts/script_with_folds.sh new file mode 100644 index 000000000..dabec3ca4 --- /dev/null +++ b/scripts/script_with_folds.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +#!/bin/bash + +travis_fold() { + local action=$1 + local name=$2 + echo -en "travis_fold:${action}:${name}\r" +} + +travis_fold start foo + +echo "This line appears in the fold's 'header'" + +echo "Stuff inside" + +sleep 2 + +echo "More stuff" + +travis_fold end foo + From c30f57e954fcd99e3a3d794a9557693fe1368344 Mon Sep 17 00:00:00 2001 From: Liu Dong Date: Tue, 21 Nov 2017 09:13:37 +0800 Subject: [PATCH 04/19] Remode deloy stage --- .travis.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index bcfc33b6d..2a8478003 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,12 +59,3 @@ addons: build_command: "unused" branch_pattern: coverity_scan.* - travis_fold:start:foo -deploy: - provider: pages - skip_cleanup: true - github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard - on: - branch: tmp - travis_fold:end:foo - From f9a16eac640bfac7d9dee3b7bca265403184b317 Mon Sep 17 00:00:00 2001 From: Liu Dong Date: Tue, 21 Nov 2017 09:31:45 +0800 Subject: [PATCH 05/19] Add deploy --- .travis.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2a8478003..f931327ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,6 @@ script: - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then ci/build-all-configs.sh; fi - - ./scripts/script_with_folds.sh addons: coverity_scan: @@ -59,3 +58,12 @@ addons: build_command: "unused" branch_pattern: coverity_scan.* +travis_fold:start:dp +deploy: + provider: pages + skip_cleanup: true + github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard + on: + branch: tmp +travis_fold:end:dp + From 6c2309d2006ed3a9c4c7073977569334dd7b11c3 Mon Sep 17 00:00:00 2001 From: Liu Dong Date: Tue, 21 Nov 2017 09:35:33 +0800 Subject: [PATCH 06/19] Deploy with fold --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f931327ff..d1f76e38d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,12 +58,14 @@ addons: build_command: "unused" branch_pattern: coverity_scan.* -travis_fold:start:dp +travis_fold start "deploy.part1" + travis_time_start deploy: provider: pages skip_cleanup: true github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard on: branch: tmp -travis_fold:end:dp + travis_time_finish +travis_fold end "deploy.part1" From ab7d885e1521c33b0ceadc7e17b8f862f430933d Mon Sep 17 00:00:00 2001 From: Liu Dong Date: Tue, 21 Nov 2017 09:47:55 +0800 Subject: [PATCH 07/19] trigger ci --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d1f76e38d..4a2ffceed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ # This work is licensed under the terms of the GNU GPL, version 2. See # the COPYING file in the top-level directory. # Don't konw whether it can be changed. +# Only for trigger travis ci. language: c From ed9d478ea48114a187bfd1d3861e26c2af851122 Mon Sep 17 00:00:00 2001 From: Liu Dong Date: Tue, 21 Nov 2017 10:21:16 +0800 Subject: [PATCH 08/19] trigger ci --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4a2ffceed..332f27b9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ addons: build_command: "unused" branch_pattern: coverity_scan.* -travis_fold start "deploy.part1" +travis_fold:start:"deploy.part1" travis_time_start deploy: provider: pages @@ -68,5 +68,5 @@ deploy: on: branch: tmp travis_time_finish -travis_fold end "deploy.part1" +travis_fold:end:"deploy.part1" From a5c0927e52a08a3949458b44b83b4922e43bf038 Mon Sep 17 00:00:00 2001 From: Liu Dong Date: Tue, 21 Nov 2017 10:36:58 +0800 Subject: [PATCH 09/19] trigger ci --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 332f27b9e..a1c780b6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,8 @@ addons: build_command: "unused" branch_pattern: coverity_scan.* -travis_fold:start:"deploy.part1" +script: + - echo 'deployPending' && echo -en 'travis_fold:start:script.deployPending\\r' travis_time_start deploy: provider: pages @@ -68,5 +69,6 @@ deploy: on: branch: tmp travis_time_finish -travis_fold:end:"deploy.part1" +script: + - echo -en 'travis_fold:end:script.deployPending\\r' From 7901bdc9c27c50fb55b484b3e6952e50f1e3ea4c Mon Sep 17 00:00:00 2001 From: Liu Dong Date: Tue, 21 Nov 2017 10:54:47 +0800 Subject: [PATCH 10/19] trigger ci --- .travis.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index a1c780b6c..bafa32108 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,11 @@ dist: trusty # see https://github.com/travis-ci/travis-ci/issues/5326 before_install: - export PATH=$(echo $PATH | sed 's/\/opt\/python[^:]*//g') +# For fold + - export -f travis_nanoseconds + - export -f travis_fold + - export -f travis_time_start + - export -f travis_time_finish install: # Install additional packages @@ -59,16 +64,9 @@ addons: build_command: "unused" branch_pattern: coverity_scan.* -script: - - echo 'deployPending' && echo -en 'travis_fold:start:script.deployPending\\r' - travis_time_start deploy: - provider: pages - skip_cleanup: true - github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard - on: - branch: tmp - travis_time_finish -script: - - echo -en 'travis_fold:end:script.deployPending\\r' + - provider: script + on: + branch: tmp + script: $TRAVIS_BUILD_DIR/deploy.sh From 2ee15ddb4f48a8b19ce5111337cbd55c06ecb10d Mon Sep 17 00:00:00 2001 From: Liu Dong Date: Tue, 21 Nov 2017 11:01:04 +0800 Subject: [PATCH 11/19] trigger ci --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index bafa32108..0270794ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,8 +65,10 @@ addons: branch_pattern: coverity_scan.* deploy: - - provider: script - on: - branch: tmp - script: $TRAVIS_BUILD_DIR/deploy.sh + provider: pages + skip_cleanup: true + github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard + on: + branch: tmp + From 38591bdf59857fbbd7122fb0dd8ef9e58451497e Mon Sep 17 00:00:00 2001 From: Liu Dong Date: Tue, 21 Nov 2017 11:08:10 +0800 Subject: [PATCH 12/19] trigger ci --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0270794ca..0e24511f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,10 +50,12 @@ cache: - ci/linux-4.13 script: - - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; + travis_fold start "build" + - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then ci/build-all-configs.sh; fi - + travis_fold end "build" + addons: coverity_scan: project: From 712d4f98a911f20f2e1c238cdfaf83fa94f6423a Mon Sep 17 00:00:00 2001 From: Liu Dong Date: Tue, 21 Nov 2017 11:20:38 +0800 Subject: [PATCH 13/19] trigger ci --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0e24511f7..f806e39fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,11 +50,11 @@ cache: - ci/linux-4.13 script: - travis_fold start "build" + - echo 'test webgl-stub' && echo -en 'travis_fold:start:build\\r' - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then ci/build-all-configs.sh; fi - travis_fold end "build" + - echo -en 'travis_fold:end:build\\r' addons: coverity_scan: From 49f46972ba1399abd6a39f577f3978917e159d08 Mon Sep 17 00:00:00 2001 From: Liu Dong Date: Tue, 21 Nov 2017 11:34:08 +0800 Subject: [PATCH 14/19] trigger ci --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f806e39fc..37f10823f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,6 +66,7 @@ addons: build_command: "unused" branch_pattern: coverity_scan.* +# GitHub Pages Deployment deploy: provider: pages skip_cleanup: true From ae9863719698d66b9b961a8cb62cc1a50024d612 Mon Sep 17 00:00:00 2001 From: Liu Dong Date: Tue, 21 Nov 2017 11:58:43 +0800 Subject: [PATCH 15/19] trigger ci --- .travis.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37f10823f..c1d29a093 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,11 +67,20 @@ addons: branch_pattern: coverity_scan.* # GitHub Pages Deployment -deploy: - provider: pages - skip_cleanup: true - github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard - on: - branch: tmp +after_success: | + if [ -n "$GITHUB_TOKEN" ]; then + cd "$TRAVIS_BUILD_DIR" + # This generates a `web` directory containing the website. + make web + cd web + git init + git checkout -b gh-pages + git add . + git -c user.name='travis' -c user.email='travis' commit -m init + # Make sure to make the output quiet, or else the API token will leak! + # This works because the API key can replace your password. + git push -f -q https://:$GITHUB_TOKEN@github.com//-gh-pages gh-pages &2>/dev/null + cd "$TRAVIS_BUILD_DIR" + fi From fc644bd3ba4ff5b71259d45538a9cf8a6e5b4256 Mon Sep 17 00:00:00 2001 From: Liu Dong Date: Tue, 21 Nov 2017 13:41:01 +0800 Subject: [PATCH 16/19] git quiet --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c1d29a093..3d18c190a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,7 +73,7 @@ after_success: | # This generates a `web` directory containing the website. make web cd web - git init + git init -q git checkout -b gh-pages git add . git -c user.name='travis' -c user.email='travis' commit -m init From 11ca7c91d562cf5644dddb50beef463df488bda0 Mon Sep 17 00:00:00 2001 From: Liu Dong Date: Tue, 21 Nov 2017 13:50:12 +0800 Subject: [PATCH 17/19] git add quiet --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3d18c190a..4c66e4869 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,7 +75,7 @@ after_success: | cd web git init -q git checkout -b gh-pages - git add . + git add . > /dev/null git -c user.name='travis' -c user.email='travis' commit -m init # Make sure to make the output quiet, or else the API token will leak! # This works because the API key can replace your password. From 4ae5998176ef7068c24d16ceeca0966f13dd54f9 Mon Sep 17 00:00:00 2001 From: Liu Dong Date: Tue, 21 Nov 2017 14:04:24 +0800 Subject: [PATCH 18/19] git add quiet --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4c66e4869..b6d3c1d28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,11 +71,11 @@ after_success: | if [ -n "$GITHUB_TOKEN" ]; then cd "$TRAVIS_BUILD_DIR" # This generates a `web` directory containing the website. - make web + mkdir web cd web git init -q git checkout -b gh-pages - git add . > /dev/null + git add . &> /dev/null git -c user.name='travis' -c user.email='travis' commit -m init # Make sure to make the output quiet, or else the API token will leak! # This works because the API key can replace your password. From 8f690666dd0900b24e2323c65ca4d44b2ff8d12a Mon Sep 17 00:00:00 2001 From: Liu Dong Date: Tue, 21 Nov 2017 14:10:46 +0800 Subject: [PATCH 19/19] git add quiet --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b6d3c1d28..bc44f3fdd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,8 +71,8 @@ after_success: | if [ -n "$GITHUB_TOKEN" ]; then cd "$TRAVIS_BUILD_DIR" # This generates a `web` directory containing the website. - mkdir web - cd web + #mkdir web + #cd web git init -q git checkout -b gh-pages git add . &> /dev/null