From 702f183259e7e74790300f1eb1190327095b0619 Mon Sep 17 00:00:00 2001 From: Erick Almeida Date: Thu, 14 Apr 2022 16:06:08 -0500 Subject: [PATCH 1/4] fix: TT-610 Fix pipeline - revert change package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 733159dd0..396d1b3fe 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "build": "ng build --prod", "test": "ng test --browsers ChromeHeadless", "test-headless": "ng test --browsers ChromeHeadless", - "ci-test": "npm run config && ng test --no-watch --no-progress --browsers ChromeHeadless", + "ci-test": "ng test --no-watch --no-progress --browsers ChromeHeadless", "lint": "ng lint", "e2e": "ng e2e" }, From 927adc979268f6cc1acad797934d8f6132884797 Mon Sep 17 00:00:00 2001 From: Santiago Atapuma Date: Thu, 14 Apr 2022 16:45:20 -0500 Subject: [PATCH 2/4] fix: TT-610 add new run line --- .github/workflows/CI-time-tracker-ui.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI-time-tracker-ui.yml b/.github/workflows/CI-time-tracker-ui.yml index 9faede480..e901dba9e 100644 --- a/.github/workflows/CI-time-tracker-ui.yml +++ b/.github/workflows/CI-time-tracker-ui.yml @@ -52,7 +52,8 @@ jobs: sh ./scripts/populate-keys.sh - name: Running tests - run: npm run config && ci-test --if-present + run: npm run config + run: npm run ci-test --if-present - name: Generate coverage report env: From 0c3531350504e363195f9a3b7cf91e3a1a3e50ca Mon Sep 17 00:00:00 2001 From: Santiago Atapuma Date: Thu, 14 Apr 2022 16:48:08 -0500 Subject: [PATCH 3/4] fix: TT-610 Fix pipeline CCI-time-tracker-ui --- .github/workflows/CI-time-tracker-ui.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/CI-time-tracker-ui.yml b/.github/workflows/CI-time-tracker-ui.yml index e901dba9e..9c81911ad 100644 --- a/.github/workflows/CI-time-tracker-ui.yml +++ b/.github/workflows/CI-time-tracker-ui.yml @@ -52,8 +52,7 @@ jobs: sh ./scripts/populate-keys.sh - name: Running tests - run: npm run config - run: npm run ci-test --if-present + run: npm run config && npm run ci-test --if-present - name: Generate coverage report env: From 98f3fc78e6066b030ad748f35c97f6e028ad068e Mon Sep 17 00:00:00 2001 From: Erick Almeida Date: Thu, 14 Apr 2022 17:43:55 -0500 Subject: [PATCH 4/4] fix: TT-610 Fix pipeline - testing log --- scripts/setenv.ts | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/setenv.ts b/scripts/setenv.ts index 659a587b2..deffe5c0f 100644 --- a/scripts/setenv.ts +++ b/scripts/setenv.ts @@ -15,19 +15,21 @@ writeFile(pathJs, contentKeys, function (err) { console.log(err); } console.log(`Wrote variables to ${pathJs}`); -}); + console.log(`${process.env["AUTHORITY"]}`); + }); -const pathJson = `./src/environments/.keys.json` -const contentKeysJson = -`{ + const pathJson = `./src/environments/.keys.json` + const contentKeysJson = + `{ "authority": "${process.env.AUTHORITY_JSON}", "client_id": "${process.env.CLIENT_ID_JSON}", "scopes": ["${process.env.SCOPES_JSON}"] -}`; + }`; -writeFile(pathJson, contentKeysJson, function (err) { + writeFile(pathJson, contentKeysJson, function (err) { if (err) { - console.log(err); + console.log(err); } console.log(`Wrote variables to ${pathJson}`); -}); + console.log(`${process.env["SCOPES"]}`); + });