From c6de3f854889dffc74b6286572911d15c35bc2a2 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Sun, 20 Dec 2020 16:57:08 -0500 Subject: [PATCH 1/9] Add makefile and automations --- Makefile | 0 dist/index.js | 19 +++++++++++++++++++ hooks/pre-commit | 4 ++++ install.sh | 12 ++++++++++++ package.json | 2 +- 5 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 Makefile create mode 100644 hooks/pre-commit create mode 100755 install.sh diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..e69de29 diff --git a/dist/index.js b/dist/index.js index 462a66c..1951fed 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2530,6 +2530,9 @@ try { const dir = core.getInput("directory"); const write_path = core.getInput("path_to_write_report"); const verbose = core.getInput("verbose"); + const working_dir = core.getInput("working-directory"); + const xcode_derived_data = core.getInput("xcode_derived_data"); + const xcode_package = core.getInput("xcode_package"); fail_ci = core.getInput("fail_ci_if_error").toLowerCase(); @@ -2651,6 +2654,22 @@ try { ); } + if (working_dir) { + options.cwd = working_dir; + } + + if (xcode_derived_data) { + execArgs.push( + "-D", `${xcode_derived_data}` + ); + } + + if (xcode_package) { + execArgs.push( + "-J", `${xcode_package}` + ); + } + exec.exec("bash", execArgs, options) .catch(err => { if (fail_ci) { diff --git a/hooks/pre-commit b/hooks/pre-commit new file mode 100644 index 0000000..1000db0 --- /dev/null +++ b/hooks/pre-commit @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +npm i --package-lock-only +npm run build diff --git a/install.sh b/install.sh new file mode 100755 index 0000000..c374b40 --- /dev/null +++ b/install.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +if ! [ -e .git ]; then + echo "Please run this from repo root directory" + exit 1 +fi + +cd .git/hooks +for i in pre-commit; do + rm -fv $i + ln -sv ../../hook/$i +done diff --git a/package.json b/package.json index 874b944..e1466c1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "codecov-action", - "version": "1.0.16", + "version": "1.1.1", "description": "Upload coverage reports to Codecov from GitHub Actions", "main": "index.js", "scripts": { From efb844969e1458c862ec91766b9126bbf6a55feb Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Sun, 20 Dec 2020 16:57:50 -0500 Subject: [PATCH 2/9] force From 58cd650984fef6fc32b7c26819da2f80ebe3b686 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Sun, 20 Dec 2020 16:58:24 -0500 Subject: [PATCH 3/9] Update package-lock --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index b8d442f..e84ff2c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "codecov-action", - "version": "1.0.15", + "version": "1.1.1", "lockfileVersion": 1, "requires": true, "dependencies": { From 4ef30f27a0061b3f6153715692e0b3bbf5bf5029 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Sun, 20 Dec 2020 16:59:07 -0500 Subject: [PATCH 4/9] Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e084d98..f84cb81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +### 1.1.1 + +#### Fixes +- #184 Makefile + ### 1.1.0 #### Features From 4686d7034ce68daada1fc22862da4d07ca1ca779 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Sun, 20 Dec 2020 16:59:47 -0500 Subject: [PATCH 5/9] Udpate CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f84cb81..58eb80e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ### 1.1.1 #### Fixes -- #184 Makefile +- #184 Add automations ensure proper builds and deployments ### 1.1.0 From 8b988c28b0225931e3dafaa583fd1b0234d42fe8 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Sun, 20 Dec 2020 17:01:12 -0500 Subject: [PATCH 6/9] Fix verbose flag --- index.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index 2aea6a8..a171233 100644 --- a/index.js +++ b/index.js @@ -4,6 +4,7 @@ const fs = require("fs"); const request = require('requestretry'); let fail_ci; +let verbose; try { const name = core.getInput("name"); const token = core.getInput("token"); @@ -13,12 +14,12 @@ try { const env_vars = core.getInput("env_vars"); const dir = core.getInput("directory"); const write_path = core.getInput("path_to_write_report"); - const verbose = core.getInput("verbose"); const working_dir = core.getInput("working-directory"); const xcode_derived_data = core.getInput("xcode_derived_data"); const xcode_package = core.getInput("xcode_package"); fail_ci = core.getInput("fail_ci_if_error").toLowerCase(); + verbose = core.getInput("verbose").toLowerCase(); if ( fail_ci === "yes" || @@ -32,6 +33,18 @@ try { fail_ci = false; } + if ( + verbose === "yes" || + verbose === "y" || + verbose === "true" || + verbose === "t" || + verbose === "1" + ) { + verbose = true; + } else { + verbose = false; + } + request({ json: false, maxAttempts: 10, From f8c87eb84eff353c49fcb2f295110a82afdca7ae Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Sun, 20 Dec 2020 17:02:09 -0500 Subject: [PATCH 7/9] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58eb80e..d416f2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ #### Fixes - #184 Add automations ensure proper builds and deployments +- #184 Fixes verbose flag ### 1.1.0 From 0c1af46295bc45dfe9c7b8fd5a2bb59864d4d194 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Sun, 20 Dec 2020 17:03:06 -0500 Subject: [PATCH 8/9] Update install script --- hooks/pre-commit | 0 install.sh | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 hooks/pre-commit diff --git a/hooks/pre-commit b/hooks/pre-commit old mode 100644 new mode 100755 diff --git a/install.sh b/install.sh index c374b40..de83bb5 100755 --- a/install.sh +++ b/install.sh @@ -8,5 +8,5 @@ fi cd .git/hooks for i in pre-commit; do rm -fv $i - ln -sv ../../hook/$i + ln -sv ../../hooks/$i done From 08574d831c904e7391c85172fd0ebe27edc5b597 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Sun, 20 Dec 2020 17:04:06 -0500 Subject: [PATCH 9/9] Add dist file --- dist/index.js | 15 ++++++++++++++- hooks/pre-commit | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dist/index.js b/dist/index.js index 1951fed..3677daa 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2520,6 +2520,7 @@ const fs = __webpack_require__(747); const request = __webpack_require__(335); let fail_ci; +let verbose; try { const name = core.getInput("name"); const token = core.getInput("token"); @@ -2529,12 +2530,12 @@ try { const env_vars = core.getInput("env_vars"); const dir = core.getInput("directory"); const write_path = core.getInput("path_to_write_report"); - const verbose = core.getInput("verbose"); const working_dir = core.getInput("working-directory"); const xcode_derived_data = core.getInput("xcode_derived_data"); const xcode_package = core.getInput("xcode_package"); fail_ci = core.getInput("fail_ci_if_error").toLowerCase(); + verbose = core.getInput("verbose").toLowerCase(); if ( fail_ci === "yes" || @@ -2548,6 +2549,18 @@ try { fail_ci = false; } + if ( + verbose === "yes" || + verbose === "y" || + verbose === "true" || + verbose === "t" || + verbose === "1" + ) { + verbose = true; + } else { + verbose = false; + } + request({ json: false, maxAttempts: 10, diff --git a/hooks/pre-commit b/hooks/pre-commit index 1000db0..ea68e88 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -2,3 +2,4 @@ npm i --package-lock-only npm run build +git add dist/index.js