Merge branch 'main' into feature/6988-roettger-LintingPackage

department-of-veterans-affairs · Dec 5, 2023 · aee9174 · aee9174
2 parents 1d1c40b + 45e3150
commit aee9174
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git 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
@@ -34,26 +34,23 @@ 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
 
       - 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
         run: yarn tsc:compile
 
       - name: Run Unit Tests (va-mobile-app)
-        working-directory: va-mobile-app/VAMobile
-        run: yarn test --testTimeout=30000
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 20
+          max_attempts: 3
+          command: |
+            cd va-mobile-app/VAMobile
+            yarn test --testTimeout=30000
diff --git 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