Merge branch 'dev' into oidc-config

AzureAD · Jul 10, 2023 · e33a2b6 · e33a2b6
2 parents 9748890 + e2901e9
commit e33a2b6
Show file tree

Hide file tree

Showing 98 changed files with 58,489 additions and 63,110 deletions.
diff --git a/.github/workflows/beachball-bump.yml b/.github/workflows/beachball-bump.yml
@@ -34,9 +34,11 @@ jobs:
       # Install node_modules
       - name: Use Node.js
         uses: actions/setup-node@v3
+        with:
+          node-version: 18
 
       - name: Install beachball
-        run: npm ci
+        run: npm ci --workspaces=false
 
       # Beachball bump
       - name: bump package versions

diff --git a/.github/workflows/beachball-check.yml b/.github/workflows/beachball-check.yml
@@ -41,10 +41,12 @@ jobs:
             - name: Use Node.js
               if: ${{ steps.filter.outputs.lib == 'true' }}
               uses: actions/setup-node@v3
+              with:
+                node-version: 18
 
             - name: Install beachball
               if: ${{ steps.filter.outputs.lib == 'true' }}
-              run: npm ci
+              run: npm ci --workspaces=false
 
             - name: Run Beachball Check command
               if: ${{ steps.filter.outputs.lib == 'true' }}

diff --git a/.github/workflows/build-test-merge-group.yml b/.github/workflows/build-test-merge-group.yml
@@ -48,8 +48,6 @@ jobs:
 
     - name: Clean Install
       if: steps.cache.outputs.cache-hit != 'true'
-      env:
-        RUNNING_NODE_CI: 1
       run: npm ci
 
     - name: Build packages
@@ -79,8 +77,6 @@ jobs:
       uses: actions/setup-node@v3
 
     - name: Clean Install
-      env:
-        RUNNING_NODE_CI: 1
       run: npm ci
 
     - name: Build packages

diff --git a/.github/workflows/ci-template.yml b/.github/workflows/ci-template.yml
@@ -34,22 +34,10 @@ jobs:
       uses: actions/setup-node@v3
       with:
         node-version: 20
+        cache: 'npm'
 
-    - name: Restore node_modules
-      uses: actions/cache@v3
-      id: cache
-      with:
-        path: |
-          node_modules
-          lib/*/node_modules
-          extensions/*/node_modules
-        key: ${{ runner.os }}-${{ hashFiles('package-lock.json', 'lib/*/package-lock.json', 'extensions/*/package-lock.json') }}
-
-    - name: Clean Install
-      if: steps.cache.outputs.cache-hit != 'true'
-      env:
-        RUNNING_NODE_CI: 1
-      run: npm ci
+    - name: Install Dependencies
+      run: npm ci --workspace=${{ inputs.path }}/${{ inputs.lib-name }} --include-workspace-root
 
     - name: Upload npm logs
       uses: actions/upload-artifact@v3

diff --git a/.github/workflows/metadata-check.yml b/.github/workflows/metadata-check.yml
@@ -25,21 +25,12 @@ jobs:
 
     - name: Use Node.js
       uses: actions/setup-node@v3
-
-    - name: Restore node_modules for libs
-      uses: actions/cache@v3
-      id: lib-cache
       with:
-        path: |
-          node_modules
-          lib/*/node_modules
-        key: ${{ runner.os }}-${{ hashFiles('package-lock.json', 'lib/*/package-lock.json') }}
+        node-version: 18
+        cache: 'npm'
 
     - name: Clean Install
-      if: steps.lib-cache.outputs.cache-hit != 'true'
-      env:
-        RUNNING_NODE_CI: 1
-      run: npm ci
+      run: npm ci --workspace=@azure/msal-common
 
     - name: Check metadata
       working-directory: lib/msal-common

diff --git a/.github/workflows/msal-angular-e2e.yml b/.github/workflows/msal-angular-e2e.yml
@@ -47,27 +47,16 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v3
       with:
-          node-version: 16
+          node-version: 18
+          cache: 'npm'
 
     - name: Clean Install
-      env:
-        RUNNING_NODE_CI: 1
-      run: npm ci
+      run: npm ci --workspace=samples/msal-angular-v3-samples/${{matrix.sample}}
 
     - name: Build packages
       working-directory: lib/msal-angular
       run: npm run build:all
 
-    - name: Install Test Tools
-      working-directory: samples/e2eTestUtils
-      run: npm install
-
-    - name: Install ${{ matrix.sample }}
-      working-directory: samples/msal-angular-v3-samples/${{ matrix.sample }}
-      run: |
-        npm run install:local
-        npm install
-
     - name: Build ${{ matrix.sample }}
       working-directory: samples/msal-angular-v3-samples/${{ matrix.sample }}
       run: npm run build

diff --git a/.github/workflows/msal-browser-e2e.yml b/.github/workflows/msal-browser-e2e.yml
@@ -48,39 +48,11 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v3
       with:
-        node-version: 16
-
-    - name: Restore node_modules for libs
-      uses: actions/cache@v3
-      id: lib-cache
-      with:
-        path: |
-          node_modules
-          lib/*/node_modules
-        key: ${{ runner.os }}-${{ hashFiles('package-lock.json', 'lib/*/package-lock.json') }}
-
+        node-version: 18
+        cache: 'npm'
+
     - name: Clean Install
-      if: steps.lib-cache.outputs.cache-hit != 'true'
-      env:
-        RUNNING_NODE_CI: 1
-      run: npm ci
-
-    - name: Install Test Tools
-      if: steps.test-tools-cache.outputs.cache-hit != 'true'
-      working-directory: samples/e2eTestUtils
-      run: npm install
-
-    - name: Restore node_modules for sample
-      uses: actions/cache@v3
-      id: sample-cache
-      with:
-        path: samples/msal-browser-samples/VanillaJSTestApp2.0/node_modules
-        key: ${{ runner.os }}-browser-sample-${{ hashFiles('samples/msal-browser-samples/VanillaJSTestApp2.0/package.json', 'samples/package-lock.json') }}
-
-    - name: Install Sample
-      if: steps.sample-cache.outputs.cache-hit != 'true'
-      working-directory: samples/msal-browser-samples/VanillaJSTestApp2.0
-      run: npm install
+      run: npm ci --workspace=vanilla-js-test-app
 
     - name: Build packages
       working-directory: samples/msal-browser-samples/VanillaJSTestApp2.0