Merge pull request #114 from dlabaj/pr-preview-upd

Fixes missing keys and packages for pr preview.
patternfly · Feb 20, 2024 · 23fa794 · 23fa794
2 parents 872d7d5 + e202e52
commit 23fa794
Show file tree

Hide file tree

Showing 4 changed files with 703 additions and 77 deletions.
diff --git a/.github/upload-preview.js b/.github/upload-preview.js
@@ -20,7 +20,7 @@ if (!uploadFolder) {
 }
 
 const uploadFolderName = path.basename(uploadFolder);
-let uploadURL = `${repo}-${prnum ? `pr-${prnum}` : prbranch}`.replace(/[\/|\.]/g, '-');
+let uploadURL = `${repo}-${prnum ? `pr-component-groups-${prnum}` : prbranch}`.replace(/[\/|\.]/g, '-');
 
 switch(uploadFolderName) {
   case 'coverage':

diff --git a/.github/workflows/pr-preview.yml b/.github/workflows/pr-preview.yml
@@ -24,38 +24,33 @@ jobs:
 
       # Yes, we really want to checkout the PR
       # Injected by generate-workflows.js
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: '16'
       - uses: actions/cache@v2
-        id: yarn-cache
+        id: npm-cache
         name: Load npm deps from cache
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-yarn-14-${{ hashFiles('yarn.lock') }}
-      - run: yarn install --frozen-lockfile
+          key: ${{ runner.os }}-npm-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('package-lock.json') }}
+      - run: npm install --frozen-lockfile
         if: steps.yarn-cache.outputs.cache-hit != 'true'
-      - run: yarn lint:js
-        name: Lint JS
-        if: always()
-      - run: yarn lint:md
-        name: Lint MD
-        if: always()
-      - run: yarn build
+
+      - run: npm run build
         name: Build component groups
       - uses: actions/cache@v2
         id: docs-cache
         name: Load webpack cache
         with:
           path: '.cache'
           key: ${{ runner.os }}-v4-${{ hashFiles('yarn.lock') }}
-      - run: yarn build:docs
+      - run: npm run build:docs
         name: Build docs
-      - run: node .github/upload-preview.js public
+      - run: node .github/upload-preview.js packages/module/public
         name: Upload docs
         if: always()
-      - run: yarn serve & yarn test
+      - run: npm run serve & npm run test
         name: a11y tests
-      - run: node .github/upload-preview.js coverage
+      - run: node .github/upload-preview.js packages/module/coverage
         name: Upload a11y report
         if: always()