From 5c21ea67d5697d5d7ccaf3b069cb1fa5cef670ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 20:51:47 +0000 Subject: [PATCH 01/16] Bump @adobe/css-tools from 4.3.1 to 4.3.2 Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.3.1 to 4.3.2. - [Changelog](https://github.com/adobe/css-tools/blob/main/History.md) - [Commits](https://github.com/adobe/css-tools/commits) --- updated-dependencies: - dependency-name: "@adobe/css-tools" dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index c0e3a108f..6579eadec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -25,9 +25,9 @@ __metadata: linkType: hard "@adobe/css-tools@npm:^4.0.1": - version: 4.3.1 - resolution: "@adobe/css-tools@npm:4.3.1" - checksum: ad43456379ff391132aff687ece190cb23ea69395e23c9b96690eeabe2468da89a4aaf266e4f8b6eaab53db3d1064107ce0f63c3a974e864f4a04affc768da3f + version: 4.3.2 + resolution: "@adobe/css-tools@npm:4.3.2" + checksum: 9667d61d55dc3b0a315c530ae84e016ce5267c4dd8ac00abb40108dc98e07b98e3090ce8b87acd51a41a68d9e84dcccb08cdf21c902572a9cf9dcaf830da4ae3 languageName: node linkType: hard From d8e0bf83a2f17f21373ad979b155a34110dc27d3 Mon Sep 17 00:00:00 2001 From: Narin Ratana Date: Mon, 4 Dec 2023 10:31:45 -0800 Subject: [PATCH 02/16] Add retry for for failed jobs --- .github/workflows/check-component-integrations.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-component-integrations.yml b/.github/workflows/check-component-integrations.yml index ae3c000bd..dddf174c8 100644 --- a/.github/workflows/check-component-integrations.yml +++ b/.github/workflows/check-component-integrations.yml @@ -4,14 +4,14 @@ name: 'Check Component Integrations' -on: +on: workflow_dispatch: push: - paths: 'packages/components/**' + paths: ['packages/components/**'] branches: - main -jobs: +jobs: check-integrations: runs-on: ubuntu-latest @@ -20,7 +20,7 @@ jobs: id: clone-lib uses: actions/checkout@v4 with: - path: va-mobile-library + path: va-mobile-library - name: Checkout (va-mobile-app) id: clone-app @@ -57,3 +57,7 @@ jobs: - name: Run Unit Tests (va-mobile-app) working-directory: va-mobile-app/VAMobile run: yarn test --testTimeout=30000 + + - name: Re-run if failed + if: failure() + run: gh run rerun ${{ github.run_id }} --failed From a9ffa349ca4726fa16a2478a890b27187b41bfcd Mon Sep 17 00:00:00 2001 From: Narin Ratana Date: Mon, 4 Dec 2023 10:33:55 -0800 Subject: [PATCH 03/16] Remove unneeded yarn installs --- .github/workflows/check-component-integrations.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/check-component-integrations.yml b/.github/workflows/check-component-integrations.yml index dddf174c8..9ca1202ac 100644 --- a/.github/workflows/check-component-integrations.yml +++ b/.github/workflows/check-component-integrations.yml @@ -34,14 +34,6 @@ jobs: working-directory: va-mobile-library run: yarn install --immutable - - name: Install token dependencies (va-mobile-library) - working-directory: va-mobile-library/packages/tokens - run: yarn install --immutable - - - name: Install component dependencies (va-mobile-library) - working-directory: va-mobile-library/packages/components - run: yarn install --immutable - - name: Install dependencies (va-mobile-app) working-directory: va-mobile-app/VAMobile run: yarn install From ed809cb98b787da1f48647c1ace77d76feea7f8a Mon Sep 17 00:00:00 2001 From: Narin Ratana Date: Mon, 4 Dec 2023 10:40:40 -0800 Subject: [PATCH 04/16] Test deliberate falure --- packages/components/src/components/Button/Button.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/src/components/Button/Button.tsx b/packages/components/src/components/Button/Button.tsx index 55df978cd..d763c1d94 100644 --- a/packages/components/src/components/Button/Button.tsx +++ b/packages/components/src/components/Button/Button.tsx @@ -54,7 +54,7 @@ export const Button: React.FC = ({ textColor: string, textColorPressed: string, borderWidth: number = 0, - borderColor: string = 'none', + borderColor: string = 3, borderColorPressed: string = 'none' switch (buttonType) { From 928f7b7116b308b7eae34c7df4c40e6617dafcf4 Mon Sep 17 00:00:00 2001 From: Narin Ratana Date: Mon, 4 Dec 2023 10:40:57 -0800 Subject: [PATCH 05/16] Fix working dir for Install local component library --- .github/workflows/check-component-integrations.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-component-integrations.yml b/.github/workflows/check-component-integrations.yml index 9ca1202ac..b71f70e4a 100644 --- a/.github/workflows/check-component-integrations.yml +++ b/.github/workflows/check-component-integrations.yml @@ -39,8 +39,8 @@ jobs: run: yarn install - name: Install local component library - working-directory: va-mobile-app - run: yarn add file:../va-mobile-library/packages/components + working-directory: va-mobile-app/VAMobile + run: yarn add file:../../va-mobile-library/packages/components - name: Compile TypeScript (va-mobile-app) working-directory: va-mobile-app/VAMobile From 30eb74ced12e449c8c95fec2beaa69e7692324a8 Mon Sep 17 00:00:00 2001 From: Narin Ratana Date: Mon, 4 Dec 2023 10:45:55 -0800 Subject: [PATCH 06/16] Add GH_TOKEN --- .github/workflows/check-component-integrations.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-component-integrations.yml b/.github/workflows/check-component-integrations.yml index b71f70e4a..44ea5041b 100644 --- a/.github/workflows/check-component-integrations.yml +++ b/.github/workflows/check-component-integrations.yml @@ -50,6 +50,6 @@ jobs: working-directory: va-mobile-app/VAMobile run: yarn test --testTimeout=30000 - - name: Re-run if failed + - name: Retry failed if: failure() - run: gh run rerun ${{ github.run_id }} --failed + run: GH_TOKEN=${{ secrets.GITHUB_TOKEN }} gh run rerun ${{ github.run_id }} --failed From 489bd5207d110b0dd145c44a50839437261f41f5 Mon Sep 17 00:00:00 2001 From: Narin Ratana Date: Mon, 4 Dec 2023 10:50:37 -0800 Subject: [PATCH 07/16] Add working dir to retry step --- .github/workflows/check-component-integrations.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-component-integrations.yml b/.github/workflows/check-component-integrations.yml index 44ea5041b..70a3aad05 100644 --- a/.github/workflows/check-component-integrations.yml +++ b/.github/workflows/check-component-integrations.yml @@ -50,6 +50,7 @@ jobs: working-directory: va-mobile-app/VAMobile run: yarn test --testTimeout=30000 - - name: Retry failed + - name: Retry failed jobs if: failure() + working-directory: va-mobile-library run: GH_TOKEN=${{ secrets.GITHUB_TOKEN }} gh run rerun ${{ github.run_id }} --failed From 5817af7a19f84637da3c1dbed895017ec9d351f9 Mon Sep 17 00:00:00 2001 From: Narin Ratana Date: Mon, 4 Dec 2023 11:21:51 -0800 Subject: [PATCH 08/16] Attempt different retry --- .../workflows/check-component-integrations.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-component-integrations.yml b/.github/workflows/check-component-integrations.yml index 70a3aad05..476b31501 100644 --- a/.github/workflows/check-component-integrations.yml +++ b/.github/workflows/check-component-integrations.yml @@ -43,14 +43,24 @@ jobs: run: yarn add file:../../va-mobile-library/packages/components - name: Compile TypeScript (va-mobile-app) + id: tsc working-directory: va-mobile-app/VAMobile run: yarn tsc:compile - name: Run Unit Tests (va-mobile-app) + id: unit-tests working-directory: va-mobile-app/VAMobile run: yarn test --testTimeout=30000 + continue-on-error: true - - name: Retry failed jobs - if: failure() - working-directory: va-mobile-library - run: GH_TOKEN=${{ secrets.GITHUB_TOKEN }} gh run rerun ${{ github.run_id }} --failed + - name: Retry failed TypeScript compile + if: steps.tsc.outcome == 'failure' + working-directory: va-mobile-app/VAMobile + run: yarn tsc:compile + continue-on-error: true + + - name: Retry failed unit tests + if: steps.unit-tests.outcome == 'failure' + working-directory: va-mobile-app/VAMobile + run: yarn test --testTimeout=30000 + continue-on-error: true From 6c63235f2fc083b7252074ea965e27d909f78283 Mon Sep 17 00:00:00 2001 From: Narin Ratana Date: Mon, 4 Dec 2023 11:29:28 -0800 Subject: [PATCH 09/16] Add continue-on-error for tsc --- .github/workflows/check-component-integrations.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/check-component-integrations.yml b/.github/workflows/check-component-integrations.yml index 476b31501..1b3008c0f 100644 --- a/.github/workflows/check-component-integrations.yml +++ b/.github/workflows/check-component-integrations.yml @@ -46,6 +46,7 @@ jobs: id: tsc working-directory: va-mobile-app/VAMobile run: yarn tsc:compile + continue-on-error: true - name: Run Unit Tests (va-mobile-app) id: unit-tests From 3e5bf537b30c32517f191330033566904f047352 Mon Sep 17 00:00:00 2001 From: Narin Ratana Date: Mon, 4 Dec 2023 11:40:00 -0800 Subject: [PATCH 10/16] Test retry-action --- .../check-component-integrations.yml | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/check-component-integrations.yml b/.github/workflows/check-component-integrations.yml index 1b3008c0f..ae8e8391e 100644 --- a/.github/workflows/check-component-integrations.yml +++ b/.github/workflows/check-component-integrations.yml @@ -43,10 +43,13 @@ jobs: run: yarn add file:../../va-mobile-library/packages/components - name: Compile TypeScript (va-mobile-app) - id: tsc + uses: nick-fields/retry@v2 working-directory: va-mobile-app/VAMobile run: yarn tsc:compile - continue-on-error: true + with: + timeout_minutes: 10 + max_attempts: 3 + command: npm run some-typically-slow-script - name: Run Unit Tests (va-mobile-app) id: unit-tests @@ -54,14 +57,8 @@ jobs: run: yarn test --testTimeout=30000 continue-on-error: true - - name: Retry failed TypeScript compile - if: steps.tsc.outcome == 'failure' - working-directory: va-mobile-app/VAMobile - run: yarn tsc:compile - continue-on-error: true - - - name: Retry failed unit tests - if: steps.unit-tests.outcome == 'failure' - working-directory: va-mobile-app/VAMobile - run: yarn test --testTimeout=30000 - continue-on-error: true + # - name: Retry failed unit tests + # if: steps.unit-tests.outcome == 'failure' + # working-directory: va-mobile-app/VAMobile + # run: yarn test --testTimeout=30000 + # continue-on-error: true From 1dd961a2abfbbf1d2367e778be4b72914073d537 Mon Sep 17 00:00:00 2001 From: Narin Ratana Date: Mon, 4 Dec 2023 11:41:59 -0800 Subject: [PATCH 11/16] Fix command --- .github/workflows/check-component-integrations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-component-integrations.yml b/.github/workflows/check-component-integrations.yml index ae8e8391e..a37b55662 100644 --- a/.github/workflows/check-component-integrations.yml +++ b/.github/workflows/check-component-integrations.yml @@ -49,7 +49,7 @@ jobs: with: timeout_minutes: 10 max_attempts: 3 - command: npm run some-typically-slow-script + command: yarn tsc:compile - name: Run Unit Tests (va-mobile-app) id: unit-tests From d55b634980bbb83ac983801ff8cbb836f3353429 Mon Sep 17 00:00:00 2001 From: Narin Ratana Date: Mon, 4 Dec 2023 11:43:14 -0800 Subject: [PATCH 12/16] Remove run and working-dir from retry-action --- .github/workflows/check-component-integrations.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-component-integrations.yml b/.github/workflows/check-component-integrations.yml index a37b55662..0c37969eb 100644 --- a/.github/workflows/check-component-integrations.yml +++ b/.github/workflows/check-component-integrations.yml @@ -44,12 +44,12 @@ jobs: - name: Compile TypeScript (va-mobile-app) uses: nick-fields/retry@v2 - working-directory: va-mobile-app/VAMobile - run: yarn tsc:compile with: timeout_minutes: 10 max_attempts: 3 - command: yarn tsc:compile + command: | + cd vamobile-app/VAMobile + yarn tsc:compile - name: Run Unit Tests (va-mobile-app) id: unit-tests From 12a0eb71b7b538c6f5ca6491335dbd1739df5465 Mon Sep 17 00:00:00 2001 From: Narin Ratana Date: Mon, 4 Dec 2023 11:50:09 -0800 Subject: [PATCH 13/16] Fix cd command --- .github/workflows/check-component-integrations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-component-integrations.yml b/.github/workflows/check-component-integrations.yml index 0c37969eb..a038270f8 100644 --- a/.github/workflows/check-component-integrations.yml +++ b/.github/workflows/check-component-integrations.yml @@ -48,7 +48,7 @@ jobs: timeout_minutes: 10 max_attempts: 3 command: | - cd vamobile-app/VAMobile + cd va-mobile-app/VAMobile yarn tsc:compile - name: Run Unit Tests (va-mobile-app) From 2e2e90c17fe8789af9ee2d76a7fa3a84f825ce23 Mon Sep 17 00:00:00 2001 From: Narin Ratana Date: Mon, 4 Dec 2023 11:58:03 -0800 Subject: [PATCH 14/16] Test deliberate unit test failure --- .../check-component-integrations.yml | 21 +++++++------------ .../src/components/Button/Button.tsx | 6 ++++-- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/.github/workflows/check-component-integrations.yml b/.github/workflows/check-component-integrations.yml index a038270f8..0f8debb2c 100644 --- a/.github/workflows/check-component-integrations.yml +++ b/.github/workflows/check-component-integrations.yml @@ -43,22 +43,15 @@ jobs: run: yarn add file:../../va-mobile-library/packages/components - name: Compile TypeScript (va-mobile-app) + id: unit-tests + working-directory: va-mobile-app/VAMobile + run: yarn tsc:compile + + - name: Run Unit Tests (va-mobile-app) uses: nick-fields/retry@v2 with: - timeout_minutes: 10 + timeout_minutes: 20 max_attempts: 3 command: | cd va-mobile-app/VAMobile - yarn tsc:compile - - - name: Run Unit Tests (va-mobile-app) - id: unit-tests - working-directory: va-mobile-app/VAMobile - run: yarn test --testTimeout=30000 - continue-on-error: true - - # - name: Retry failed unit tests - # if: steps.unit-tests.outcome == 'failure' - # working-directory: va-mobile-app/VAMobile - # run: yarn test --testTimeout=30000 - # continue-on-error: true + yarn test --testTimeout=30000 diff --git a/packages/components/src/components/Button/Button.tsx b/packages/components/src/components/Button/Button.tsx index d763c1d94..714aa46ed 100644 --- a/packages/components/src/components/Button/Button.tsx +++ b/packages/components/src/components/Button/Button.tsx @@ -54,9 +54,11 @@ export const Button: React.FC = ({ textColor: string, textColorPressed: string, borderWidth: number = 0, - borderColor: string = 3, + borderColor: string = 'none', borderColorPressed: string = 'none' + console.log(onPress) + switch (buttonType) { case ButtonVariants.Base: bgColor = DesignTokens.colorGrayMedium @@ -175,7 +177,7 @@ export const Button: React.FC = ({ return ( Date: Mon, 4 Dec 2023 12:07:39 -0800 Subject: [PATCH 15/16] Revert deliberate failure --- packages/components/src/components/Button/Button.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/components/src/components/Button/Button.tsx b/packages/components/src/components/Button/Button.tsx index 714aa46ed..55df978cd 100644 --- a/packages/components/src/components/Button/Button.tsx +++ b/packages/components/src/components/Button/Button.tsx @@ -57,8 +57,6 @@ export const Button: React.FC = ({ borderColor: string = 'none', borderColorPressed: string = 'none' - console.log(onPress) - switch (buttonType) { case ButtonVariants.Base: bgColor = DesignTokens.colorGrayMedium @@ -177,7 +175,7 @@ export const Button: React.FC = ({ return ( Date: Mon, 4 Dec 2023 12:15:59 -0800 Subject: [PATCH 16/16] Revert id --- .github/workflows/check-component-integrations.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/check-component-integrations.yml b/.github/workflows/check-component-integrations.yml index 0f8debb2c..e0f27bd5d 100644 --- a/.github/workflows/check-component-integrations.yml +++ b/.github/workflows/check-component-integrations.yml @@ -43,7 +43,6 @@ jobs: run: yarn add file:../../va-mobile-library/packages/components - name: Compile TypeScript (va-mobile-app) - id: unit-tests working-directory: va-mobile-app/VAMobile run: yarn tsc:compile