From 8c4975eae78701ccec6b84052c543a0f94bc8c12 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Wed, 12 Dec 2018 22:31:03 +0100 Subject: [PATCH 01/23] CI: update git configuration - git: clone with depth=1 - git: no recursive submodule no more dependency on savannah.nongnu.org nor bearssl.org --- .travis.yml | 7 +++++++ package/build_boards_manager_package.sh | 9 --------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 276b393141..90ec7ddff4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,13 @@ language: bash os: linux dist: trusty +git: + depth: 1 + submodules: false + +before_install: + - git submodule update --init # no recursive update + cache: directories: - $HOME/astyle diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh index 3f108d16d5..c8ed44e79e 100755 --- a/package/build_boards_manager_package.sh +++ b/package/build_boards_manager_package.sh @@ -48,15 +48,6 @@ srcdir=$PWD rm -rf package/versions/$ver mkdir -p $outdir -# Get submodules -modules=libraries/SoftwareSerial -for mod in $modules; do - echo "refreshing submodule: $mod" - git submodule update --init -- $mod - (cd $mod && git reset --hard) -done -echo "done with submodules" - # Some files should be excluded from the package cat << EOF > exclude.txt .git From fbc2084dde82a61e6b947d90e0f3fa0f3867c0a2 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Wed, 12 Dec 2018 23:35:57 +0100 Subject: [PATCH 02/23] show curl headers --- package/build_boards_manager_package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh index c8ed44e79e..3cff24b727 100755 --- a/package/build_boards_manager_package.sh +++ b/package/build_boards_manager_package.sh @@ -130,7 +130,7 @@ if [ ! -z "$CI_GITHUB_API_KEY" ]; then curl_gh_token_arg=(-H "Authorization: token $CI_GITHUB_API_KEY") fi # Get previous release name -curl --silent "${curl_gh_token_arg[@]}" https://api.github.com/repos/esp8266/Arduino/releases > releases.json +curl --silent -D /dev/stderr "${curl_gh_token_arg[@]}" https://api.github.com/repos/esp8266/Arduino/releases > releases.json # Previous final release (prerelase == false) prev_release=$(jq -r '. | map(select(.draft == false and .prerelease == false)) | sort_by(.created_at | - fromdateiso8601) | .[0].tag_name' releases.json) # Previous release (possibly a pre-release) From d4a228200a4dffff77f705034ef1efe90958299f Mon Sep 17 00:00:00 2001 From: david gauchard Date: Wed, 12 Dec 2018 23:36:11 +0100 Subject: [PATCH 03/23] debug mode --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 90ec7ddff4..8d80689c44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ cache: - $HOME/astyle stages: - - build +# - build - deploy jobs: From e741bc33b4e569ad2fc39bb29d7d60d06c3c3b5d Mon Sep 17 00:00:00 2001 From: david gauchard Date: Wed, 12 Dec 2018 23:41:01 +0100 Subject: [PATCH 04/23] try another key --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8d80689c44..2480c549a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,7 +92,8 @@ jobs: draft: true skip_cleanup: true api_key: - secure: kYsxX/N21fwLSTLpbb0c96PnQHn1CIMqZstm02hfUhCX83FygWSh4vs3gzW28DMpjQMZ6vC4g+jtfosYU2tUhht/bynurDH4edpEyGeMyK+fzCI9pAr4JT0RbKQI84EC18ScpgP/UP0jTc1LJ+xl8UMwSiDE0mzHx7xJ4mMNQbA= + #secure: kYsxX/N21fwLSTLpbb0c96PnQHn1CIMqZstm02hfUhCX83FygWSh4vs3gzW28DMpjQMZ6vC4g+jtfosYU2tUhht/bynurDH4edpEyGeMyK+fzCI9pAr4JT0RbKQI84EC18ScpgP/UP0jTc1LJ+xl8UMwSiDE0mzHx7xJ4mMNQbA= + secure: vt6StBC+ghqnh8YrreNo3wAzGGddJ2S4YpVZkz4S84xLEGWkIEghQhTrjlhzjBsrnHfLNko4tz9EsNx0yQ8yBlPOdReETGAkqnAU7PSPFss0qGcCRUXYtozNjbFQq6TWIxECK4xq40R9tE6NyeOpm9AYJtwF/v18u2T+T9qSgGQ= file_glob: true tag_name: $TRAVIS_TAG target_commitish: $TRAVIS_COMMIT From 3d3b8a3f19c19cc02802de273690d43c6b6ca838 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Wed, 12 Dec 2018 23:46:46 +0100 Subject: [PATCH 05/23] test --- .travis.yml | 3 +-- package/build_boards_manager_package.sh | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2480c549a5..8d80689c44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,8 +92,7 @@ jobs: draft: true skip_cleanup: true api_key: - #secure: kYsxX/N21fwLSTLpbb0c96PnQHn1CIMqZstm02hfUhCX83FygWSh4vs3gzW28DMpjQMZ6vC4g+jtfosYU2tUhht/bynurDH4edpEyGeMyK+fzCI9pAr4JT0RbKQI84EC18ScpgP/UP0jTc1LJ+xl8UMwSiDE0mzHx7xJ4mMNQbA= - secure: vt6StBC+ghqnh8YrreNo3wAzGGddJ2S4YpVZkz4S84xLEGWkIEghQhTrjlhzjBsrnHfLNko4tz9EsNx0yQ8yBlPOdReETGAkqnAU7PSPFss0qGcCRUXYtozNjbFQq6TWIxECK4xq40R9tE6NyeOpm9AYJtwF/v18u2T+T9qSgGQ= + secure: kYsxX/N21fwLSTLpbb0c96PnQHn1CIMqZstm02hfUhCX83FygWSh4vs3gzW28DMpjQMZ6vC4g+jtfosYU2tUhht/bynurDH4edpEyGeMyK+fzCI9pAr4JT0RbKQI84EC18ScpgP/UP0jTc1LJ+xl8UMwSiDE0mzHx7xJ4mMNQbA= file_glob: true tag_name: $TRAVIS_TAG target_commitish: $TRAVIS_COMMIT diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh index 3cff24b727..c0ed25b047 100755 --- a/package/build_boards_manager_package.sh +++ b/package/build_boards_manager_package.sh @@ -124,6 +124,11 @@ fi cat $srcdir/package/package_esp8266com_index.template.json | \ jq "$jq_arg" > package_esp8266com_index.json +#force +echo "${CI_GITHUB_API_KEY}" +CI_GITHUB_API_KEY="vt6StBC+ghqnh8YrreNo3wAzGGddJ2S4YpVZkz4S84xLEGWkIEghQhTrjlhzjBsrnHfLNko4tz9EsNx0yQ8yBlPOdReETGAkqnAU7PSPFss0qGcCRUXYtozNjbFQq6TWIxECK4xq40R9tE6NyeOpm9AYJtwF/v18u2T+T9qSgGQ=" +echo "${CI_GITHUB_API_KEY}" + # Use Github API token, if available curl_gh_token_arg=() if [ ! -z "$CI_GITHUB_API_KEY" ]; then From afed781e92137d0a0a94ec4cc071279dd460796f Mon Sep 17 00:00:00 2001 From: david gauchard Date: Wed, 12 Dec 2018 23:56:21 +0100 Subject: [PATCH 06/23] test --- package/build_boards_manager_package.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh index c0ed25b047..3934f6146c 100755 --- a/package/build_boards_manager_package.sh +++ b/package/build_boards_manager_package.sh @@ -125,9 +125,9 @@ cat $srcdir/package/package_esp8266com_index.template.json | \ jq "$jq_arg" > package_esp8266com_index.json #force -echo "${CI_GITHUB_API_KEY}" +echo "1=${CI_GITHUB_API_KEY}" CI_GITHUB_API_KEY="vt6StBC+ghqnh8YrreNo3wAzGGddJ2S4YpVZkz4S84xLEGWkIEghQhTrjlhzjBsrnHfLNko4tz9EsNx0yQ8yBlPOdReETGAkqnAU7PSPFss0qGcCRUXYtozNjbFQq6TWIxECK4xq40R9tE6NyeOpm9AYJtwF/v18u2T+T9qSgGQ=" -echo "${CI_GITHUB_API_KEY}" +echo "2=${CI_GITHUB_API_KEY}" # Use Github API token, if available curl_gh_token_arg=() @@ -135,7 +135,11 @@ if [ ! -z "$CI_GITHUB_API_KEY" ]; then curl_gh_token_arg=(-H "Authorization: token $CI_GITHUB_API_KEY") fi # Get previous release name -curl --silent -D /dev/stderr "${curl_gh_token_arg[@]}" https://api.github.com/repos/esp8266/Arduino/releases > releases.json +echo "debug: curl --silent -D /dev/stderr ${curl_gh_token_arg[@]}" +curl --silent -D /dev/stderr ${curl_gh_token_arg[@]} https://api.github.com/repos/esp8266/Arduino/releases > releases.json || \ +curl --silent -D /dev/stderr https://api.github.com/repos/esp8266/Arduino/releases > releases.json || \ +exit 0 + # Previous final release (prerelase == false) prev_release=$(jq -r '. | map(select(.draft == false and .prerelease == false)) | sort_by(.created_at | - fromdateiso8601) | .[0].tag_name' releases.json) # Previous release (possibly a pre-release) From 3d6e2866fa518ffd7579d362f8d7958fb4a5dac7 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Thu, 13 Dec 2018 00:05:58 +0100 Subject: [PATCH 07/23] test --- package/build_boards_manager_package.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh index 3934f6146c..e439c7ba58 100755 --- a/package/build_boards_manager_package.sh +++ b/package/build_boards_manager_package.sh @@ -125,20 +125,19 @@ cat $srcdir/package/package_esp8266com_index.template.json | \ jq "$jq_arg" > package_esp8266com_index.json #force -echo "1=${CI_GITHUB_API_KEY}" -CI_GITHUB_API_KEY="vt6StBC+ghqnh8YrreNo3wAzGGddJ2S4YpVZkz4S84xLEGWkIEghQhTrjlhzjBsrnHfLNko4tz9EsNx0yQ8yBlPOdReETGAkqnAU7PSPFss0qGcCRUXYtozNjbFQq6TWIxECK4xq40R9tE6NyeOpm9AYJtwF/v18u2T+T9qSgGQ=" -echo "2=${CI_GITHUB_API_KEY}" +#echo "1=${CI_GITHUB_API_KEY}" +#CI_GITHUB_API_KEY="vt6StBC+ghqnh8YrreNo3wAzGGddJ2S4YpVZkz4S84xLEGWkIEghQhTrjlhzjBsrnHfLNko4tz9EsNx0yQ8yBlPOdReETGAkqnAU7PSPFss0qGcCRUXYtozNjbFQq6TWIxECK4xq40R9tE6NyeOpm9AYJtwF/v18u2T+T9qSgGQ=" +#echo "2=${CI_GITHUB_API_KEY}" # Use Github API token, if available curl_gh_token_arg=() -if [ ! -z "$CI_GITHUB_API_KEY" ]; then +if [ -z "$CI_GITHUB_API_KEY" ]; then + echo "curl: not using API key" +else curl_gh_token_arg=(-H "Authorization: token $CI_GITHUB_API_KEY") fi # Get previous release name -echo "debug: curl --silent -D /dev/stderr ${curl_gh_token_arg[@]}" -curl --silent -D /dev/stderr ${curl_gh_token_arg[@]} https://api.github.com/repos/esp8266/Arduino/releases > releases.json || \ -curl --silent -D /dev/stderr https://api.github.com/repos/esp8266/Arduino/releases > releases.json || \ -exit 0 +curl --silent -D /dev/stderr ${curl_gh_token_arg[@]} https://api.github.com/repos/esp8266/Arduino/releases > releases.json # Previous final release (prerelase == false) prev_release=$(jq -r '. | map(select(.draft == false and .prerelease == false)) | sort_by(.created_at | - fromdateiso8601) | .[0].tag_name' releases.json) From dce8dce44f64848531f889df1dfe1897f3a1319d Mon Sep 17 00:00:00 2001 From: david gauchard Date: Thu, 13 Dec 2018 00:24:45 +0100 Subject: [PATCH 08/23] deploy task will successfully exit if no key is used --- .travis.yml | 2 +- package/build_boards_manager_package.sh | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d80689c44..90ec7ddff4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ cache: - $HOME/astyle stages: -# - build + - build - deploy jobs: diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh index e439c7ba58..8aac469eda 100755 --- a/package/build_boards_manager_package.sh +++ b/package/build_boards_manager_package.sh @@ -124,15 +124,11 @@ fi cat $srcdir/package/package_esp8266com_index.template.json | \ jq "$jq_arg" > package_esp8266com_index.json -#force -#echo "1=${CI_GITHUB_API_KEY}" -#CI_GITHUB_API_KEY="vt6StBC+ghqnh8YrreNo3wAzGGddJ2S4YpVZkz4S84xLEGWkIEghQhTrjlhzjBsrnHfLNko4tz9EsNx0yQ8yBlPOdReETGAkqnAU7PSPFss0qGcCRUXYtozNjbFQq6TWIxECK4xq40R9tE6NyeOpm9AYJtwF/v18u2T+T9qSgGQ=" -#echo "2=${CI_GITHUB_API_KEY}" - # Use Github API token, if available curl_gh_token_arg=() if [ -z "$CI_GITHUB_API_KEY" ]; then - echo "curl: not using API key" + echo "curl: API key not present, exit with no error" + exit 0 else curl_gh_token_arg=(-H "Authorization: token $CI_GITHUB_API_KEY") fi From e1eca80d283363bf6733abcf097931fccf82526c Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Thu, 13 Dec 2018 10:19:02 +0100 Subject: [PATCH 09/23] CI: deploy: use env TRAVIS_PULL_REQUEST to condition deploy --- .travis.yml | 3 ++- package/build_boards_manager_package.sh | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 90ec7ddff4..c0c0c6527f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,7 +85,8 @@ jobs: stage: deploy script: $TRAVIS_BUILD_DIR/tests/common.sh env: BUILD_TYPE=package - if: env(CI_GITHUB_API_KEY) IS present + # TRAVIS_PULL_REQUEST is set to the pull request number if the current job is a pull request build, or false if it’s not. + if: env(TRAVIS_PULL_REQUEST) != "false" deploy: # Create Github release, upload artifacts - provider: releases diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh index 8aac469eda..b41b4fff99 100755 --- a/package/build_boards_manager_package.sh +++ b/package/build_boards_manager_package.sh @@ -124,14 +124,14 @@ fi cat $srcdir/package/package_esp8266com_index.template.json | \ jq "$jq_arg" > package_esp8266com_index.json -# Use Github API token, if available +# Use Github API token, must be available curl_gh_token_arg=() if [ -z "$CI_GITHUB_API_KEY" ]; then - echo "curl: API key not present, exit with no error" - exit 0 -else - curl_gh_token_arg=(-H "Authorization: token $CI_GITHUB_API_KEY") + echo "curl: API key not present, exit with error" + exit 1 fi +curl_gh_token_arg=(-H "Authorization: token $CI_GITHUB_API_KEY") + # Get previous release name curl --silent -D /dev/stderr ${curl_gh_token_arg[@]} https://api.github.com/repos/esp8266/Arduino/releases > releases.json From 5fa07cd587be421ebfcc719aa16fc20f2d8fa4e0 Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Thu, 13 Dec 2018 10:43:43 +0100 Subject: [PATCH 10/23] test --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c0c0c6527f..caeba5b0d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,9 @@ cache: directories: - $HOME/astyle -stages: - - build - - deploy +#stages: +# - build +# - deploy jobs: include: From 1978e7bd0dc7e364a2d6401b8072901bc653b641 Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Thu, 13 Dec 2018 11:37:54 +0100 Subject: [PATCH 11/23] wip --- .travis.yml | 3 ++- package/build_boards_manager_package.sh | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index caeba5b0d2..6c10c9273b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ cache: directories: - $HOME/astyle +#useless? #stages: # - build # - deploy @@ -82,11 +83,11 @@ jobs: # Deploy stage. # Here we build the package JSON (always) and do the deployments - name: "Package / deploy" + if: env(TRAVIS_PULL_REQUEST) != "false" stage: deploy script: $TRAVIS_BUILD_DIR/tests/common.sh env: BUILD_TYPE=package # TRAVIS_PULL_REQUEST is set to the pull request number if the current job is a pull request build, or false if it’s not. - if: env(TRAVIS_PULL_REQUEST) != "false" deploy: # Create Github release, upload artifacts - provider: releases diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh index b41b4fff99..9010767968 100755 --- a/package/build_boards_manager_package.sh +++ b/package/build_boards_manager_package.sh @@ -132,8 +132,14 @@ if [ -z "$CI_GITHUB_API_KEY" ]; then fi curl_gh_token_arg=(-H "Authorization: token $CI_GITHUB_API_KEY") +# test +echo "key was '$CI_GITHUB_API_KEY'" +CI_GITHUB_API_KEY="vt6StBC+ghqnh8YrreNo3wAzGGddJ2S4YpVZkz4S84xLEGWkIEghQhTrjlhzjBsrnHfLNko4tz9EsNx0yQ8yBlPOdReETGAkqnAU7PSPFss0qGcCRUXYtozNjbFQq6TWIxECK4xq40R9tE6NyeOpm9AYJtwF/v18u2T+T9qSgGQ=" + # Get previous release name +echo "======== curl dumped header" curl --silent -D /dev/stderr ${curl_gh_token_arg[@]} https://api.github.com/repos/esp8266/Arduino/releases > releases.json +echo "======== curl" # Previous final release (prerelase == false) prev_release=$(jq -r '. | map(select(.draft == false and .prerelease == false)) | sort_by(.created_at | - fromdateiso8601) | .[0].tag_name' releases.json) From 1576aacb934902a5499be83968ee73bc0d61d9f8 Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Thu, 13 Dec 2018 12:00:36 +0100 Subject: [PATCH 12/23] wip --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6c10c9273b..5a1b9f8d61 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,7 +83,7 @@ jobs: # Deploy stage. # Here we build the package JSON (always) and do the deployments - name: "Package / deploy" - if: env(TRAVIS_PULL_REQUEST) != "false" + if: env(TRAVIS_PULL_REQUEST) = "false" stage: deploy script: $TRAVIS_BUILD_DIR/tests/common.sh env: BUILD_TYPE=package From 4c56a8c4625a0bfebe0ce27f05890ec287757c26 Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Thu, 13 Dec 2018 12:04:11 +0100 Subject: [PATCH 13/23] wip --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5a1b9f8d61..abd04d21a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,7 +83,7 @@ jobs: # Deploy stage. # Here we build the package JSON (always) and do the deployments - name: "Package / deploy" - if: env(TRAVIS_PULL_REQUEST) = "false" + if: env(CI_GITHUB_API_KEY) IS present stage: deploy script: $TRAVIS_BUILD_DIR/tests/common.sh env: BUILD_TYPE=package From e1e1bb3e2109f49f212bae4a187363104c7af8de Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Thu, 13 Dec 2018 12:12:27 +0100 Subject: [PATCH 14/23] wip --- .travis.yml | 6 ++++-- package/build_boards_manager_package.sh | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index abd04d21a1..9b7f5d88bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,11 +83,13 @@ jobs: # Deploy stage. # Here we build the package JSON (always) and do the deployments - name: "Package / deploy" - if: env(CI_GITHUB_API_KEY) IS present + # TRAVIS_PULL_REQUEST_BRANCH: + # if the current job is a pull request, the name of the branch from which the PR originated. + # if the current job is a push build, this variable is empty (""). + if: env(TRAVIS_PULL_REQUEST_BRANCH) = "" stage: deploy script: $TRAVIS_BUILD_DIR/tests/common.sh env: BUILD_TYPE=package - # TRAVIS_PULL_REQUEST is set to the pull request number if the current job is a pull request build, or false if it’s not. deploy: # Create Github release, upload artifacts - provider: releases diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh index 9010767968..3b15eec9bf 100755 --- a/package/build_boards_manager_package.sh +++ b/package/build_boards_manager_package.sh @@ -133,8 +133,9 @@ fi curl_gh_token_arg=(-H "Authorization: token $CI_GITHUB_API_KEY") # test -echo "key was '$CI_GITHUB_API_KEY'" -CI_GITHUB_API_KEY="vt6StBC+ghqnh8YrreNo3wAzGGddJ2S4YpVZkz4S84xLEGWkIEghQhTrjlhzjBsrnHfLNko4tz9EsNx0yQ8yBlPOdReETGAkqnAU7PSPFss0qGcCRUXYtozNjbFQq6TWIxECK4xq40R9tE6NyeOpm9AYJtwF/v18u2T+T9qSgGQ=" +#echo "key was '$CI_GITHUB_API_KEY'" +# this key (below) is working, the overwritten key is not empty +#CI_GITHUB_API_KEY="vt6StBC+ghqnh8YrreNo3wAzGGddJ2S4YpVZkz4S84xLEGWkIEghQhTrjlhzjBsrnHfLNko4tz9EsNx0yQ8yBlPOdReETGAkqnAU7PSPFss0qGcCRUXYtozNjbFQq6TWIxECK4xq40R9tE6NyeOpm9AYJtwF/v18u2T+T9qSgGQ=" # Get previous release name echo "======== curl dumped header" From ebe129c083fe7cfd46115dad5dcddda04a41c7d2 Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Thu, 13 Dec 2018 12:21:06 +0100 Subject: [PATCH 15/23] wip --- .travis.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b7f5d88bb..1b4a0c5cfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,11 +13,6 @@ cache: directories: - $HOME/astyle -#useless? -#stages: -# - build -# - deploy - jobs: include: # Build stage. To save time, run all kinds of builds and tests in parallel. @@ -83,10 +78,8 @@ jobs: # Deploy stage. # Here we build the package JSON (always) and do the deployments - name: "Package / deploy" - # TRAVIS_PULL_REQUEST_BRANCH: - # if the current job is a pull request, the name of the branch from which the PR originated. - # if the current job is a push build, this variable is empty (""). - if: env(TRAVIS_PULL_REQUEST_BRANCH) = "" + # require the branch name to NOT be master (note for PRs this is the base branch name) + if: branch != master stage: deploy script: $TRAVIS_BUILD_DIR/tests/common.sh env: BUILD_TYPE=package From bce2c99831098c469925ef783cd1cd296e3bf79b Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Thu, 13 Dec 2018 12:31:46 +0100 Subject: [PATCH 16/23] wip --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1b4a0c5cfb..eefa6f8c9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,8 +78,7 @@ jobs: # Deploy stage. # Here we build the package JSON (always) and do the deployments - name: "Package / deploy" - # require the branch name to NOT be master (note for PRs this is the base branch name) - if: branch != master + if: type != pull_request stage: deploy script: $TRAVIS_BUILD_DIR/tests/common.sh env: BUILD_TYPE=package From c762de34f5d8aa298dc8b9e7623c34edd798766d Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Thu, 13 Dec 2018 14:27:09 +0100 Subject: [PATCH 17/23] wip --- .travis.yml | 1 - package/build_boards_manager_package.sh | 22 +++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index eefa6f8c9d..3a6c553d2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,7 +78,6 @@ jobs: # Deploy stage. # Here we build the package JSON (always) and do the deployments - name: "Package / deploy" - if: type != pull_request stage: deploy script: $TRAVIS_BUILD_DIR/tests/common.sh env: BUILD_TYPE=package diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh index 3b15eec9bf..62f7ed0362 100755 --- a/package/build_boards_manager_package.sh +++ b/package/build_boards_manager_package.sh @@ -127,19 +127,23 @@ cat $srcdir/package/package_esp8266com_index.template.json | \ # Use Github API token, must be available curl_gh_token_arg=() if [ -z "$CI_GITHUB_API_KEY" ]; then - echo "curl: API key not present, exit with error" - exit 1 + echo "curl: API key not present" +else + echo "curl: API key is present" + curl_gh_token_arg=(-H "Authorization: token $CI_GITHUB_API_KEY") fi -curl_gh_token_arg=(-H "Authorization: token $CI_GITHUB_API_KEY") - -# test -#echo "key was '$CI_GITHUB_API_KEY'" -# this key (below) is working, the overwritten key is not empty -#CI_GITHUB_API_KEY="vt6StBC+ghqnh8YrreNo3wAzGGddJ2S4YpVZkz4S84xLEGWkIEghQhTrjlhzjBsrnHfLNko4tz9EsNx0yQ8yBlPOdReETGAkqnAU7PSPFss0qGcCRUXYtozNjbFQq6TWIxECK4xq40R9tE6NyeOpm9AYJtwF/v18u2T+T9qSgGQ=" # Get previous release name echo "======== curl dumped header" -curl --silent -D /dev/stderr ${curl_gh_token_arg[@]} https://api.github.com/repos/esp8266/Arduino/releases > releases.json +if ! curl --silent -D /dev/stderr ${curl_gh_token_arg[@]} https://api.github.com/repos/esp8266/Arduino/releases > releases.json; then + if [ -z "$CI_GITHUB_API_KEY" ]; then + echo "---- Bad moon phase, in a PR, exit successfully" + exit 0 + else + echo "---- Please debug curl request, exit with error" + exit 1 + fi +fi echo "======== curl" # Previous final release (prerelase == false) From 5dd09ede78f414fb304cd89ed8a403deb9adda36 Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Thu, 13 Dec 2018 16:04:12 +0100 Subject: [PATCH 18/23] wip --- package/build_boards_manager_package.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh index 62f7ed0362..997da7880a 100755 --- a/package/build_boards_manager_package.sh +++ b/package/build_boards_manager_package.sh @@ -134,8 +134,12 @@ else fi # Get previous release name -echo "======== curl dumped header" -if ! curl --silent -D /dev/stderr ${curl_gh_token_arg[@]} https://api.github.com/repos/esp8266/Arduino/releases > releases.json; then +echo "running: 'curl --silent -D curl-headers.txt ${curl_gh_token_arg[@]} https://api.github.com/repos/esp8266/Arduino/releases > releases.json'" +curl --silent -D curl-headers.txt ${curl_gh_token_arg[@]} https://api.github.com/repos/esp8266/Arduino/releases > releases.json +echo "======== >>> curl dumped header >>>" +cat curl-headers.txt +echo "======== <<< curl dumped header <<<" +if ! grep "200 OK$" curl-headers.txt > /dev/null; then if [ -z "$CI_GITHUB_API_KEY" ]; then echo "---- Bad moon phase, in a PR, exit successfully" exit 0 @@ -144,7 +148,6 @@ if ! curl --silent -D /dev/stderr ${curl_gh_token_arg[@]} https://api.github.com exit 1 fi fi -echo "======== curl" # Previous final release (prerelase == false) prev_release=$(jq -r '. | map(select(.draft == false and .prerelease == false)) | sort_by(.created_at | - fromdateiso8601) | .[0].tag_name' releases.json) From 6cb7fcebb05c99e1dbd0229d1cdee1ebebd79db1 Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Thu, 13 Dec 2018 18:26:49 +0100 Subject: [PATCH 19/23] wip --- .travis.yml | 3 ++- package/build_boards_manager_package.sh | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3a6c553d2c..bdc807d220 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,7 +87,8 @@ jobs: draft: true skip_cleanup: true api_key: - secure: kYsxX/N21fwLSTLpbb0c96PnQHn1CIMqZstm02hfUhCX83FygWSh4vs3gzW28DMpjQMZ6vC4g+jtfosYU2tUhht/bynurDH4edpEyGeMyK+fzCI9pAr4JT0RbKQI84EC18ScpgP/UP0jTc1LJ+xl8UMwSiDE0mzHx7xJ4mMNQbA= + #secure: kYsxX/N21fwLSTLpbb0c96PnQHn1CIMqZstm02hfUhCX83FygWSh4vs3gzW28DMpjQMZ6vC4g+jtfosYU2tUhht/bynurDH4edpEyGeMyK+fzCI9pAr4JT0RbKQI84EC18ScpgP/UP0jTc1LJ+xl8UMwSiDE0mzHx7xJ4mMNQbA= + secure: vt6StBC+ghqnh8YrreNo3wAzGGddJ2S4YpVZkz4S84xLEGWkIEghQhTrjlhzjBsrnHfLNko4tz9EsNx0yQ8yBlPOdReETGAkqnAU7PSPFss0qGcCRUXYtozNjbFQq6TWIxECK4xq40R9tE6NyeOpm9AYJtwF/v18u2T+T9qSgGQ= file_glob: true tag_name: $TRAVIS_TAG target_commitish: $TRAVIS_COMMIT diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh index 97d0a571e3..b8cbda3c9c 100755 --- a/package/build_boards_manager_package.sh +++ b/package/build_boards_manager_package.sh @@ -124,17 +124,17 @@ cat $srcdir/package/package_esp8266com_index.template.json | \ jq "$jq_arg" > package_esp8266com_index.json # Use Github API token, must be available -curl_gh_token_arg=() if [ -z "$CI_GITHUB_API_KEY" ]; then echo "curl: API key not present" + echo "running: 'curl --silent -D curl-headers.txt https://api.github.com/repos/esp8266/Arduino/releases > releases.json'" + curl --silent -D curl-headers.txt https://api.github.com/repos/esp8266/Arduino/releases > releases.json else echo "curl: API key is present" - curl_gh_token_arg=(-H "Authorization: token $CI_GITHUB_API_KEY") + echo "running: 'curl --silent -D curl-headers.txt -H \"Authorization: token $CI_GITHUB_API_KEY\" https://api.github.com/repos/esp8266/Arduino/releases > releases.json'" + curl --silent -D curl-headers.txt -H "Authorization: token $CI_GITHUB_API_KEY" https://api.github.com/repos/esp8266/Arduino/releases > releases.json fi # Get previous release name -echo "running: 'curl --silent -D curl-headers.txt ${curl_gh_token_arg[@]} https://api.github.com/repos/esp8266/Arduino/releases > releases.json'" -curl --silent -D curl-headers.txt ${curl_gh_token_arg[@]} https://api.github.com/repos/esp8266/Arduino/releases > releases.json echo "======== >>> curl dumped header >>>" cat curl-headers.txt echo "======== <<< curl dumped header <<<" From dfb9a8a32743b10cbf194ef0c61fc95dd417917e Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Thu, 13 Dec 2018 23:10:04 +0100 Subject: [PATCH 20/23] wip --- package/build_boards_manager_package.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh index b8cbda3c9c..5335949d15 100755 --- a/package/build_boards_manager_package.sh +++ b/package/build_boards_manager_package.sh @@ -126,11 +126,11 @@ cat $srcdir/package/package_esp8266com_index.template.json | \ # Use Github API token, must be available if [ -z "$CI_GITHUB_API_KEY" ]; then echo "curl: API key not present" - echo "running: 'curl --silent -D curl-headers.txt https://api.github.com/repos/esp8266/Arduino/releases > releases.json'" + echo "running: 'curl --silent -D curl-headers.txt https://api.github.com/repos/esp8266/Arduino/releases'" curl --silent -D curl-headers.txt https://api.github.com/repos/esp8266/Arduino/releases > releases.json else echo "curl: API key is present" - echo "running: 'curl --silent -D curl-headers.txt -H \"Authorization: token $CI_GITHUB_API_KEY\" https://api.github.com/repos/esp8266/Arduino/releases > releases.json'" + echo "running: 'curl --silent -D curl-headers.txt -H \"Authorization: token $CI_GITHUB_API_KEY\" https://api.github.com/repos/esp8266/Arduino/releases'" curl --silent -D curl-headers.txt -H "Authorization: token $CI_GITHUB_API_KEY" https://api.github.com/repos/esp8266/Arduino/releases > releases.json fi @@ -138,7 +138,7 @@ fi echo "======== >>> curl dumped header >>>" cat curl-headers.txt echo "======== <<< curl dumped header <<<" -if ! grep "200 OK$" curl-headers.txt > /dev/null; then +if ! grep "HTTP.*200 OK" curl-headers.txt > /dev/null; then if [ -z "$CI_GITHUB_API_KEY" ]; then echo "---- Bad moon phase, in a PR, exit successfully" exit 0 From c7156e1dc9a708cb3ee2fa87c48707273a30d02e Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Fri, 14 Dec 2018 00:01:17 +0100 Subject: [PATCH 21/23] was working, retrying with original key --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bdc807d220..f3a128aeb9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,8 +87,8 @@ jobs: draft: true skip_cleanup: true api_key: - #secure: kYsxX/N21fwLSTLpbb0c96PnQHn1CIMqZstm02hfUhCX83FygWSh4vs3gzW28DMpjQMZ6vC4g+jtfosYU2tUhht/bynurDH4edpEyGeMyK+fzCI9pAr4JT0RbKQI84EC18ScpgP/UP0jTc1LJ+xl8UMwSiDE0mzHx7xJ4mMNQbA= - secure: vt6StBC+ghqnh8YrreNo3wAzGGddJ2S4YpVZkz4S84xLEGWkIEghQhTrjlhzjBsrnHfLNko4tz9EsNx0yQ8yBlPOdReETGAkqnAU7PSPFss0qGcCRUXYtozNjbFQq6TWIxECK4xq40R9tE6NyeOpm9AYJtwF/v18u2T+T9qSgGQ= + secure: kYsxX/N21fwLSTLpbb0c96PnQHn1CIMqZstm02hfUhCX83FygWSh4vs3gzW28DMpjQMZ6vC4g+jtfosYU2tUhht/bynurDH4edpEyGeMyK+fzCI9pAr4JT0RbKQI84EC18ScpgP/UP0jTc1LJ+xl8UMwSiDE0mzHx7xJ4mMNQbA= + #secure: vt6StBC+ghqnh8YrreNo3wAzGGddJ2S4YpVZkz4S84xLEGWkIEghQhTrjlhzjBsrnHfLNko4tz9EsNx0yQ8yBlPOdReETGAkqnAU7PSPFss0qGcCRUXYtozNjbFQq6TWIxECK4xq40R9tE6NyeOpm9AYJtwF/v18u2T+T9qSgGQ= file_glob: true tag_name: $TRAVIS_TAG target_commitish: $TRAVIS_COMMIT From 55b9a2ef551ed93d3a6ec345896598947aca82d8 Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Fri, 14 Dec 2018 01:20:48 +0100 Subject: [PATCH 22/23] wip --- .travis.yml | 1 - package/build_boards_manager_package.sh | 11 ++++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index f3a128aeb9..3a6c553d2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,7 +88,6 @@ jobs: skip_cleanup: true api_key: secure: kYsxX/N21fwLSTLpbb0c96PnQHn1CIMqZstm02hfUhCX83FygWSh4vs3gzW28DMpjQMZ6vC4g+jtfosYU2tUhht/bynurDH4edpEyGeMyK+fzCI9pAr4JT0RbKQI84EC18ScpgP/UP0jTc1LJ+xl8UMwSiDE0mzHx7xJ4mMNQbA= - #secure: vt6StBC+ghqnh8YrreNo3wAzGGddJ2S4YpVZkz4S84xLEGWkIEghQhTrjlhzjBsrnHfLNko4tz9EsNx0yQ8yBlPOdReETGAkqnAU7PSPFss0qGcCRUXYtozNjbFQq6TWIxECK4xq40R9tE6NyeOpm9AYJtwF/v18u2T+T9qSgGQ= file_glob: true tag_name: $TRAVIS_TAG target_commitish: $TRAVIS_COMMIT diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh index 5335949d15..aca8b64e1e 100755 --- a/package/build_boards_manager_package.sh +++ b/package/build_boards_manager_package.sh @@ -123,23 +123,24 @@ fi cat $srcdir/package/package_esp8266com_index.template.json | \ jq "$jq_arg" > package_esp8266com_index.json -# Use Github API token, must be available +# Use Github API token, when available +curl_gh_token_arg=() if [ -z "$CI_GITHUB_API_KEY" ]; then echo "curl: API key not present" - echo "running: 'curl --silent -D curl-headers.txt https://api.github.com/repos/esp8266/Arduino/releases'" - curl --silent -D curl-headers.txt https://api.github.com/repos/esp8266/Arduino/releases > releases.json else echo "curl: API key is present" - echo "running: 'curl --silent -D curl-headers.txt -H \"Authorization: token $CI_GITHUB_API_KEY\" https://api.github.com/repos/esp8266/Arduino/releases'" - curl --silent -D curl-headers.txt -H "Authorization: token $CI_GITHUB_API_KEY" https://api.github.com/repos/esp8266/Arduino/releases > releases.json + curl_gh_token_arg=(-H "Authorization: token $CI_GITHUB_API_KEY") fi # Get previous release name +curl --silent -D curl-headers.txt "${curl_gh_token_arg[@]}" https://api.github.com/repos/esp8266/Arduino/releases > releases.json + echo "======== >>> curl dumped header >>>" cat curl-headers.txt echo "======== <<< curl dumped header <<<" if ! grep "HTTP.*200 OK" curl-headers.txt > /dev/null; then if [ -z "$CI_GITHUB_API_KEY" ]; then + # github api is rate-limiting echo "---- Bad moon phase, in a PR, exit successfully" exit 0 else From 28a59a16889136524f6851643b54cbbbbb6b3eb4 Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Fri, 14 Dec 2018 02:14:56 +0100 Subject: [PATCH 23/23] restore sequential group jobs --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3a6c553d2c..32784a1e85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,10 @@ cache: directories: - $HOME/astyle +stages: + - build + - deploy + jobs: include: # Build stage. To save time, run all kinds of builds and tests in parallel.