Skip to content

Commit 60bc354

Browse files
edonehooedonehoo
authored
Merge branch 'main' into iss4795
2 parents 691b2e9 + 50fafa3 commit 60bc354

File tree

13 files changed

+63
-25
lines changed

13 files changed

+63
-25
lines changed

‎.github/generate-workflows.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,12 @@ fs.readdirSync(inDir)
2929

3030
Object.entries(partials).forEach(([key, val]) => {
3131
const regexText = `([ \\t]*)%${key}%`;
32-
const spacing = contents.match(new RegExp(regexText))[1];
33-
val = `${spacing}${val.replace(/\n/g, '\n' + spacing)}`;
34-
contents = contents.replace(new RegExp(regexText, 'g'), val);
32+
const match = contents.match(new RegExp(regexText));
33+
if (match) {
34+
const spacing = match[1];
35+
val = `${spacing}${val.replace(/\n/g, '\n' + spacing)}`;
36+
contents = contents.replace(new RegExp(regexText, 'g'), val);
37+
}
3538
});
3639

3740
contents = `### WARNING -- this file was generated by ${process.argv[1].split(path.sep).pop()}\n${contents}`;

‎.github/workflows-src/pr-preview.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
GH_PR_TOKEN: ${{ secrets.GH_PR_TOKEN }}
1010
GH_PR_NUM: ${{ github.event.number }}
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v4
1313
# Yes, we really want to checkout the PR
1414
- run: |
1515
git fetch origin pull/$GH_PR_NUM/head:tmp
@@ -26,7 +26,7 @@ jobs:
2626
GH_PR_TOKEN: ${{ secrets.GH_PR_TOKEN }}
2727
GH_PR_NUM: ${{ github.event.number }}
2828
steps:
29-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v4
3030
- run: |
3131
git fetch origin pull/$GH_PR_NUM/head:tmp
3232
git checkout tmp

‎.github/workflows-src/release.yml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ jobs:
1010
env:
1111
GH_TOKEN: ${{ secrets.GH_TOKEN_REDALLEN }} # needs to be an admin token to get around branch protection
1212
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
13+
GH_PR_TOKEN: ${{ secrets.GH_PR_TOKEN }}
14+
SURGE_LOGIN: ${{ secrets.SURGE_LOGIN }}
15+
SURGE_TOKEN: ${{ secrets.SURGE_TOKEN }}
1316
steps:
1417
- run: printenv
15-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v4
1619
with:
1720
token: ${{ secrets.GH_TOKEN_REDALLEN }} # needs to be an admin token to get around branch protection
1821
# Injected by generate-workflows.js
@@ -30,3 +33,12 @@ jobs:
3033
name: Check size of docs
3134
- run: .github/upload-staging.sh
3235
name: Upload docs to staging
36+
- run: yarn build:extensions
37+
name: Build extension docs
38+
- name: Upload extension only docs
39+
uses: dswistowski/surge-sh-action@v1
40+
with:
41+
domain: 'pf-extensions-staging.patternfly.org'
42+
project: 'build/patternfly-org/site'
43+
login: ${{ secrets.SURGE_LOGIN }}
44+
token: ${{ secrets.SURGE_TOKEN }}

‎.github/workflows/pr-preview.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
GH_PR_TOKEN: ${{ secrets.GH_PR_TOKEN }}
1111
GH_PR_NUM: ${{ github.event.number }}
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414
# Yes, we really want to checkout the PR
1515
- run: |
1616
git fetch origin pull/$GH_PR_NUM/head:tmp
@@ -39,7 +39,7 @@ jobs:
3939
GH_PR_TOKEN: ${{ secrets.GH_PR_TOKEN }}
4040
GH_PR_NUM: ${{ github.event.number }}
4141
steps:
42-
- uses: actions/checkout@v2
42+
- uses: actions/checkout@v4
4343
- run: |
4444
git fetch origin pull/$GH_PR_NUM/head:tmp
4545
git checkout tmp

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### WARNING -- this file was generated by generate-workflows
1+
### WARNING -- this file was generated by generate-workflows.js
22
name: release
33
on:
44
push:
@@ -11,11 +11,12 @@ jobs:
1111
env:
1212
GH_TOKEN: ${{ secrets.GH_TOKEN_REDALLEN }} # needs to be an admin token to get around branch protection
1313
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
14+
GH_PR_TOKEN: ${{ secrets.GH_PR_TOKEN }}
1415
SURGE_LOGIN: ${{ secrets.SURGE_LOGIN }}
1516
SURGE_TOKEN: ${{ secrets.SURGE_TOKEN }}
1617
steps:
1718
- run: printenv
18-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v4
1920
with:
2021
token: ${{ secrets.GH_TOKEN_REDALLEN }} # needs to be an admin token to get around branch protection
2122
# Injected by generate-workflows.js
@@ -24,13 +25,12 @@ jobs:
2425
node-version: 22
2526
- run: corepack enable
2627
- run: yarn install --immutable
27-
# v6 build
2828
- uses: actions/cache@v4
2929
id: site-cache
30-
name: Load webpack cache
30+
name: Load rspack cache
3131
with:
3232
path: "packages/documentation-site/.cache"
33-
key: ${{ runner.os }}-site-${{ hashFiles('yarn.lock') }}
33+
key: ${{ runner.os }}-${{ hashFiles('yarn.lock') }}
3434
- run: yarn build
3535
name: Build docs
3636
- run: .github/release.sh

‎packages/ast-helpers/CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# 1.4.0-alpha.327 (2026-01-09)
7+
8+
9+
### Bug Fixes
10+
11+
* update action version in gh action scripts ([#4902](https://github.com/patternfly/patternfly-org/issues/4902)) ([43abeea](https://github.com/patternfly/patternfly-org/commit/43abeea95b3a0b863332fcf867a0345707c93f68))
12+
13+
14+
15+
16+
617
# 1.4.0-alpha.326 (2025-12-17)
718

819

‎packages/ast-helpers/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@patternfly/ast-helpers",
33
"description": "Acorn AST helpers for working with live code",
4-
"version": "1.4.0-alpha.326",
4+
"version": "1.4.0-alpha.327",
55
"author": "Red Hat",
66
"license": "MIT",
77
"publishConfig": {

‎packages/documentation-framework/CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## 6.33.1 (2026-01-09)
7+
8+
9+
### Bug Fixes
10+
11+
* update action version in gh action scripts ([#4902](https://github.com/patternfly/patternfly-org/issues/4902)) ([43abeea](https://github.com/patternfly/patternfly-org/commit/43abeea95b3a0b863332fcf867a0345707c93f68))
12+
13+
14+
15+
16+
617
# 6.33.0 (2025-12-17)
718

819

‎packages/documentation-framework/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@patternfly/documentation-framework",
33
"description": "A framework to build documentation for PatternFly.",
4-
"version": "6.33.0",
4+
"version": "6.33.1",
55
"author": "Red Hat",
66
"license": "MIT",
77
"bin": {
@@ -12,7 +12,7 @@
1212
"@babel/preset-env": "7.27.1",
1313
"@babel/preset-react": "^7.24.1",
1414
"@mdx-js/util": "1.6.16",
15-
"@patternfly/ast-helpers": "^1.4.0-alpha.326",
15+
"@patternfly/ast-helpers": "^1.4.0-alpha.327",
1616
"@reach/router": "npm:@gatsbyjs/reach-router@1.3.9",
1717
"autoprefixer": "10.4.19",
1818
"babel-loader": "^9.1.3",

‎packages/documentation-framework/versions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"@patternfly/react-catalog-view-extension": "6.3.0-prerelease.2",
1010
"@patternfly/react-charts": "8.5.0-prerelease.9",
1111
"@patternfly/react-code-editor": "6.5.0-prerelease.26",
12-
"@patternfly/react-component-groups": "6.4.0-prerelease.10",
12+
"@patternfly/react-component-groups": "6.4.0-prerelease.12",
1313
"@patternfly/react-core": "6.5.0-prerelease.24",
1414
"@patternfly/react-drag-drop": "6.5.0-prerelease.24",
1515
"@patternfly/react-icons": "6.5.0-prerelease.11",

0 commit comments

Comments
 (0)