Skip to content

Commit 588d44f

Browse files
committed
Merge branch 'add-logsnippet' of github.com:patternfly/react-component-groups into add-logsnippet
2 parents 96c265e + 9c8dbf8 commit 588d44f

File tree

4 files changed

+703
-77
lines changed

4 files changed

+703
-77
lines changed

.github/upload-preview.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if (!uploadFolder) {
2020
}
2121

2222
const uploadFolderName = path.basename(uploadFolder);
23-
let uploadURL = `${repo}-${prnum ? `pr-${prnum}` : prbranch}`.replace(/[\/|\.]/g, '-');
23+
let uploadURL = `${repo}-${prnum ? `pr-component-groups-${prnum}` : prbranch}`.replace(/[\/|\.]/g, '-');
2424

2525
switch(uploadFolderName) {
2626
case 'coverage':

.github/workflows/pr-preview.yml

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,38 +24,33 @@ jobs:
2424
2525
# Yes, we really want to checkout the PR
2626
# Injected by generate-workflows.js
27-
- uses: actions/setup-node@v1
27+
- uses: actions/setup-node@v3
2828
with:
29-
node-version: '18'
29+
node-version: '16'
3030
- uses: actions/cache@v2
31-
id: yarn-cache
31+
id: npm-cache
3232
name: Load npm deps from cache
3333
with:
3434
path: '**/node_modules'
35-
key: ${{ runner.os }}-yarn-14-${{ hashFiles('yarn.lock') }}
36-
- run: yarn install --frozen-lockfile
35+
key: ${{ runner.os }}-npm-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('package-lock.json') }}
36+
- run: npm install --frozen-lockfile
3737
if: steps.yarn-cache.outputs.cache-hit != 'true'
38-
- run: yarn lint:js
39-
name: Lint JS
40-
if: always()
41-
- run: yarn lint:md
42-
name: Lint MD
43-
if: always()
44-
- run: yarn build
38+
39+
- run: npm run build
4540
name: Build component groups
4641
- uses: actions/cache@v2
4742
id: docs-cache
4843
name: Load webpack cache
4944
with:
5045
path: '.cache'
5146
key: ${{ runner.os }}-v4-${{ hashFiles('yarn.lock') }}
52-
- run: yarn build:docs
47+
- run: npm run build:docs
5348
name: Build docs
54-
- run: node .github/upload-preview.js public
49+
- run: node .github/upload-preview.js packages/module/public
5550
name: Upload docs
5651
if: always()
57-
- run: yarn serve & yarn test
52+
- run: npm run serve & npm run test
5853
name: a11y tests
59-
- run: node .github/upload-preview.js coverage
54+
- run: node .github/upload-preview.js packages/module/coverage
6055
name: Upload a11y report
6156
if: always()

0 commit comments

Comments
 (0)