From d5dc4d3c0cf80b359b5bc14213536e32d849fb8d Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Wed, 13 Jan 2021 17:14:26 -0500 Subject: [PATCH 01/12] Urlencode job --- SHA1SUM | 2 +- SHA256SUM | 2 +- SHA512SUM | 2 +- codecov | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/SHA1SUM b/SHA1SUM index 5fe72527..fb3ce428 100644 --- a/SHA1SUM +++ b/SHA1SUM @@ -1 +1 @@ -b2d91c9a9e5e44495e7cb28bb01812024f007332 codecov +10ec1c3feda425eb1d1e4f30ad9f3cde73dbaf10 codecov diff --git a/SHA256SUM b/SHA256SUM index 20c2a21d..2f1b0afe 100644 --- a/SHA256SUM +++ b/SHA256SUM @@ -1 +1 @@ -980c09cd11e443d3976fd5be6d5d58704bf4c702866974200c0bdb1a275110a2 codecov +38bbc871df5672f1e6c8a01a9cfa18779e7e2c7115a6c5d5b54d17984076dfc5 codecov diff --git a/SHA512SUM b/SHA512SUM index 2b4b6426..5eb8b8b0 100644 --- a/SHA512SUM +++ b/SHA512SUM @@ -1 +1 @@ -a5d92fd71ae5c8ed558f995cc8788a8ea4395431809238591f525e4965f137676ca293caebf206f0a7f59b5690561e6b2642eaf9cba290a6777d51e9aa2d26f2 codecov +e7eabfdf5b7541af46326ea2ab3559c671bcfc636c782d48c7d1f96a6862739400b3a1d0ffbbf055149655d62681de011ddea8186db085b26523f3a1491bc85d codecov diff --git a/codecov b/codecov index aa1c445d..75d58653 100755 --- a/codecov +++ b/codecov @@ -206,7 +206,6 @@ urlencode() { echo "$1" | curl -Gso /dev/null -w "%{url_effective}" --data-urlencode @- "" | cut -c 3- | sed -e 's/%0A//' } - swiftcov() { _dir=$(dirname "$1" | sed 's/\(Build\).*/\1/g') for _type in app framework xctest @@ -1081,7 +1080,7 @@ query="branch=$branch\ &service=$service\ &flags=$flags\ &pr=$([ "$pr_o" = "" ] && echo "${pr##\#}" || echo "${pr_o##\#}")\ - &job=$job\ + &job=$(urlencode $job)\ &cmd_args=$(IFS=,; echo "${codecov_flags[*]}")" if [ -n "$project" ] && [ -n "$server_uri" ]; From 7402708ab2c8dc098839ea75a621774dd5a00726 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Wed, 13 Jan 2021 17:18:28 -0500 Subject: [PATCH 02/12] Add test --- tests/test | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/test b/tests/test index de1fd4b9..17634764 100755 --- a/tests/test +++ b/tests/test @@ -386,6 +386,19 @@ function test_github_action_pr () { assertURL "https://codecov.io/upload/v4?package=bash-$VERSION&token=&branch=patch-2&commit=$TEST_DATA_GIT_COMMIT&build=32402849&build_url=http%3A%2F%2Fgithub.com%2Fcodecov%2Fci-repo%2Factions%2Fruns%2F32402849&name=&tag=&slug=codecov%2Fci-repo&service=github-actions&flags=&pr=7&job=&cmd_args=d,C" } +function test_github_action_emoji () { + reset + + export GITHUB_ACTIONS="true" + export GITHUB_REF="refs/heads/master" + export GITHUB_REPOSITORY="codecov/ci-repo" + export GITHUB_RUN_ID="32402849" + export GITHUB_SHA="$TEST_DATA_GIT_COMMIT" + export GITHUB_WORKFLOW="💡🏠" + + assertURL "https://codecov.io/upload/v4?package=bash-$VERSION&token=&branch=master&commit=$TEST_DATA_GIT_COMMIT&build=32402849&build_url=http%3A%2F%2Fgithub.com%2Fcodecov%2Fci-repo%2Factions%2Fruns%2F32402849&name=&tag=&slug=codecov%2Fci-repo&service=github-actions&flags=&pr=&job=%F0%9F%92%A1%F0%9F%8F%A0&cmd_args=d,C" +} + function test_semaphore (){ reset export CI="true" From a1ae1d105b22444c792cd17d1a1f95d7904f59c8 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Wed, 13 Jan 2021 17:21:02 -0500 Subject: [PATCH 03/12] Only urlencode github actions --- SHA1SUM | 2 +- SHA256SUM | 2 +- SHA512SUM | 2 +- codecov | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SHA1SUM b/SHA1SUM index fb3ce428..b61c67be 100644 --- a/SHA1SUM +++ b/SHA1SUM @@ -1 +1 @@ -10ec1c3feda425eb1d1e4f30ad9f3cde73dbaf10 codecov +6945802000f2a35233a5ec77bcb98dc2860df945 codecov diff --git a/SHA256SUM b/SHA256SUM index 2f1b0afe..b0c1d8c3 100644 --- a/SHA256SUM +++ b/SHA256SUM @@ -1 +1 @@ -38bbc871df5672f1e6c8a01a9cfa18779e7e2c7115a6c5d5b54d17984076dfc5 codecov +142d87272a994145841520f2fb8dc2779d8f930e6ebcbff1cff7d8c7926aa6a5 codecov diff --git a/SHA512SUM b/SHA512SUM index 5eb8b8b0..f7370b1f 100644 --- a/SHA512SUM +++ b/SHA512SUM @@ -1 +1 @@ -e7eabfdf5b7541af46326ea2ab3559c671bcfc636c782d48c7d1f96a6862739400b3a1d0ffbbf055149655d62681de011ddea8186db085b26523f3a1491bc85d codecov +aff570aa72dd2e4e8cff31a9dee79b43605a2025268c5aafa508649662fc7034d8cb606ee5555afc9f452b163198694ed16471039612e7bf27c01e01ef208c77 codecov diff --git a/codecov b/codecov index 75d58653..9423b903 100755 --- a/codecov +++ b/codecov @@ -836,7 +836,7 @@ then slug="${GITHUB_REPOSITORY}" build="${GITHUB_RUN_ID}" build_url=$(urlencode "http://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}") - job="${GITHUB_WORKFLOW}" + job="$(urlencode GITHUB_WORKFLOW)" # actions/checkout runs in detached HEAD mc= @@ -1080,7 +1080,7 @@ query="branch=$branch\ &service=$service\ &flags=$flags\ &pr=$([ "$pr_o" = "" ] && echo "${pr##\#}" || echo "${pr_o##\#}")\ - &job=$(urlencode $job)\ + &job=$job\ &cmd_args=$(IFS=,; echo "${codecov_flags[*]}")" if [ -n "$project" ] && [ -n "$server_uri" ]; From ef273efd4cd07ec7414c474210635aaa1e1418a8 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Wed, 13 Jan 2021 17:22:26 -0500 Subject: [PATCH 04/12] Oops --- SHA1SUM | 2 +- SHA256SUM | 2 +- SHA512SUM | 2 +- codecov | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SHA1SUM b/SHA1SUM index b61c67be..3ffd90c5 100644 --- a/SHA1SUM +++ b/SHA1SUM @@ -1 +1 @@ -6945802000f2a35233a5ec77bcb98dc2860df945 codecov +51e661024bda292f1834b50852bd5cbb710ae8eb codecov diff --git a/SHA256SUM b/SHA256SUM index b0c1d8c3..f2c5d7c3 100644 --- a/SHA256SUM +++ b/SHA256SUM @@ -1 +1 @@ -142d87272a994145841520f2fb8dc2779d8f930e6ebcbff1cff7d8c7926aa6a5 codecov +f85be6af1c1c3e1131cbf4dfaa9c1a514998df691b5e5c451d662c2aa70fb4ef codecov diff --git a/SHA512SUM b/SHA512SUM index f7370b1f..2c77ca7e 100644 --- a/SHA512SUM +++ b/SHA512SUM @@ -1 +1 @@ -aff570aa72dd2e4e8cff31a9dee79b43605a2025268c5aafa508649662fc7034d8cb606ee5555afc9f452b163198694ed16471039612e7bf27c01e01ef208c77 codecov +f601ab18f210dd0fb90ad57ccb021de7e5a94f3b0d9228c74e33c07ef054ee0bc0515273b25fa4209112c908f097bf0b9baff92b5c4d30038d8ce100c761f918 codecov diff --git a/codecov b/codecov index 9423b903..0098ec42 100755 --- a/codecov +++ b/codecov @@ -836,7 +836,7 @@ then slug="${GITHUB_REPOSITORY}" build="${GITHUB_RUN_ID}" build_url=$(urlencode "http://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}") - job="$(urlencode GITHUB_WORKFLOW)" + job="$(urlencode ${GITHUB_WORKFLOW})" # actions/checkout runs in detached HEAD mc= From 2027585ea67d246b64b9661d80902065bcf79db8 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Wed, 13 Jan 2021 17:25:01 -0500 Subject: [PATCH 05/12] Migrate Circle commands to Travis --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index fb44b5b3..c185e024 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,6 +20,10 @@ jobs: command: | env -i PATH="$PATH" bashcov tests/test + env -i PATH="$PATH" shellcheck codecov tests/test + shasum --algorithm 1 --check --strict ./SHA1SUM + shasum --algorithm 256 --check --strict ./SHA256SUM + shasum --algorithm 512 --check --strict ./SHA512SUM - run: name: Upload Codecov command: | From e429bccf78561548cf57b776263eed852635f1be Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Wed, 13 Jan 2021 17:26:25 -0500 Subject: [PATCH 06/12] Shellcheck --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c185e024..926e1e43 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: command: | env -i PATH="$PATH" bashcov tests/test - env -i PATH="$PATH" shellcheck codecov tests/test + shellcheck codecov tests/test shasum --algorithm 1 --check --strict ./SHA1SUM shasum --algorithm 256 --check --strict ./SHA256SUM shasum --algorithm 512 --check --strict ./SHA512SUM From 673ab5b545f2d36ecf9a3c5baa4dc365d86a7103 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Wed, 13 Jan 2021 17:28:47 -0500 Subject: [PATCH 07/12] Install shellcheck --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 926e1e43..a07640c0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,6 +15,7 @@ jobs: gem install simplecov gem install simplecov-cobertura gem install bashcov + apt-get install ShellCheck - run: name: Run Tests command: | From 8855364961e10078fb1343ea5163ec2657c799eb Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Wed, 13 Jan 2021 17:31:00 -0500 Subject: [PATCH 08/12] Use shellcheck orb --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a07640c0..6af76028 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,6 @@ version: 2.1 +orbs: + shellcheck: circleci/shellcheck@2.2.2 jobs: build: docker: @@ -15,7 +17,6 @@ jobs: gem install simplecov gem install simplecov-cobertura gem install bashcov - apt-get install ShellCheck - run: name: Run Tests command: | @@ -25,6 +26,8 @@ jobs: shasum --algorithm 1 --check --strict ./SHA1SUM shasum --algorithm 256 --check --strict ./SHA256SUM shasum --algorithm 512 --check --strict ./SHA512SUM + - shellcheck/check: + dir: . - run: name: Upload Codecov command: | From 3058f7d7160f942b8049fe9b5dfe6b59db518b8c Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Wed, 13 Jan 2021 17:32:28 -0500 Subject: [PATCH 09/12] Remove shellcheck call --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6af76028..5b36a5f0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,6 @@ jobs: command: | env -i PATH="$PATH" bashcov tests/test - shellcheck codecov tests/test shasum --algorithm 1 --check --strict ./SHA1SUM shasum --algorithm 256 --check --strict ./SHA256SUM shasum --algorithm 512 --check --strict ./SHA512SUM From 03884f819f75c1da2ee532e8fc39dfb7313e83c9 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Wed, 13 Jan 2021 17:34:52 -0500 Subject: [PATCH 10/12] Install shellcheck --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b36a5f0..9482cefc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,16 +17,16 @@ jobs: gem install simplecov gem install simplecov-cobertura gem install bashcov + - shellcheck/install - run: name: Run Tests command: | env -i PATH="$PATH" bashcov tests/test + shellcheck codecov tests/test shasum --algorithm 1 --check --strict ./SHA1SUM shasum --algorithm 256 --check --strict ./SHA256SUM shasum --algorithm 512 --check --strict ./SHA512SUM - - shellcheck/check: - dir: . - run: name: Upload Codecov command: | From a2d6e6177ae4b3d61009d56be3c8074fb521ed75 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Wed, 13 Jan 2021 17:36:04 -0500 Subject: [PATCH 11/12] Double quotes --- SHA1SUM | 2 +- SHA256SUM | 2 +- SHA512SUM | 2 +- codecov | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SHA1SUM b/SHA1SUM index 3ffd90c5..e4c1a7e3 100644 --- a/SHA1SUM +++ b/SHA1SUM @@ -1 +1 @@ -51e661024bda292f1834b50852bd5cbb710ae8eb codecov +b9287f592cf823e36c63f2cdc8bdee6419a5032a codecov diff --git a/SHA256SUM b/SHA256SUM index f2c5d7c3..dfb5d6eb 100644 --- a/SHA256SUM +++ b/SHA256SUM @@ -1 +1 @@ -f85be6af1c1c3e1131cbf4dfaa9c1a514998df691b5e5c451d662c2aa70fb4ef codecov +04365f195758f9be5baa8c46bf4143e225e1fdac04c03b10658c2f8f40872aa6 codecov diff --git a/SHA512SUM b/SHA512SUM index 2c77ca7e..5db399bc 100644 --- a/SHA512SUM +++ b/SHA512SUM @@ -1 +1 @@ -f601ab18f210dd0fb90ad57ccb021de7e5a94f3b0d9228c74e33c07ef054ee0bc0515273b25fa4209112c908f097bf0b9baff92b5c4d30038d8ce100c761f918 codecov +e5805df57005d62819b4d724ae8092e4adb908a71064f56975845c094792496a3a9411e58ef78047c0a21f205b033c0874f26c360bbb55dda102c5bf65d72c8e codecov diff --git a/codecov b/codecov index 0098ec42..8f28ce56 100755 --- a/codecov +++ b/codecov @@ -836,7 +836,7 @@ then slug="${GITHUB_REPOSITORY}" build="${GITHUB_RUN_ID}" build_url=$(urlencode "http://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}") - job="$(urlencode ${GITHUB_WORKFLOW})" + job="$(urlencode "${GITHUB_WORKFLOW}")" # actions/checkout runs in detached HEAD mc= From 0d268424aa901ab45aa22ba1f428e82792c807f2 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Wed, 13 Jan 2021 17:37:17 -0500 Subject: [PATCH 12/12] Remove travis --- .travis.yml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 565f104f..00000000 --- a/.travis.yml +++ /dev/null @@ -1,19 +0,0 @@ -dist: bionic -language: ruby -addons: - apt: - packages: - - libdigest-sha-perl - - shunit2 -notifications: - email: false -sudo: false -script: - # Confirm tests pass first - - env -i PATH="$PATH" tests/test - # Run the source through ShellCheck (http://www.shellcheck.net). - - env -i PATH="$PATH" shellcheck codecov tests/test - - - shasum --algorithm 1 --check --strict ./SHA1SUM - - shasum --algorithm 256 --check --strict ./SHA256SUM - - shasum --algorithm 512 --check --strict ./SHA512SUM