Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ echo "Doing a release..."
LOG=$(git log --format="%s" -1 | grep -Poe "#\d+")
PR_NUM=${LOG:1}

yarn run lerna publish --conventional-commits --create-release=github --no-verify-access --yes 2>&1 | tee lerna-output.txt
yarn run lerna publish --conventional-commits --conventional-prerelease --create-release=github --no-verify-access --no-private --yes 2>&1 | tee lerna-output.txt

if grep -i "Successfully published" lerna-output.txt; # Leave a Github comment
then
Expand Down
6 changes: 3 additions & 3 deletions .github/upload-staging.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
aws s3 rm --recursive s3://patternfly-org-staging
aws s3 rm --recursive s3://patternfly-org-v5
# TODO: Proper S3 meta tags for redirects
aws s3 sync build/patternfly-org s3://patternfly-org-staging --exclude "*" \
aws s3 sync build/patternfly-org s3://patternfly-org-v5 --exclude "*" \
--include "*.html" \
--include "*.json" \
--exclude "static/**/*.json" \
--include "sw.js" \
--cache-control "public, max-age=0, must-revalidate"

aws s3 sync build/patternfly-org s3://patternfly-org-staging --include "*" \
aws s3 sync build/patternfly-org s3://patternfly-org-v5 --include "*" \
--exclude "*.html" \
--exclude "*.json" \
--include "static/**/*.json" \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: release
on:
push:
branches:
- main
- v5
jobs:
build-deploy:
if: "!contains(github.event.head_commit.message, 'ci skip')"
Expand Down
3 changes: 2 additions & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
"packages/documentation-framework",
"packages/v4"
],
"version": "independent"
"version": "independent",
"allowBranch": ["main", "v5"]
}
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
]
},
"devDependencies": {
"@octokit/rest": "^16.43.2",
"glob": "^7.1.6",
"lerna": "^3.19.0",
"surge": "^0.21.3"
"@octokit/rest": "^19.0.7",
"glob": "^8.1.0",
"lerna": "^6.4.1",
"surge": "^0.23.1"
},
"resolutions": {
"node-sass": ">=6.0.1"
Expand Down
18 changes: 11 additions & 7 deletions packages/documentation-framework/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
{
"name": "@patternfly/documentation-framework",
"description": "A framework to build documentation for PatternFly.",
"version": "1.6.0",
"version": "2.0.0-alpha.0",
"author": "Red Hat",
"license": "MIT",
"private": false,
"publishConfig": {
"access": "public",
"tag": "alpha"
},
"bin": {
"pf-docs-framework": "scripts/cli/cli.js"
},
Expand Down Expand Up @@ -77,11 +81,11 @@
"webpack-merge": "5.8.0"
},
"peerDependencies": {
"@patternfly/patternfly": ">=4.185.1",
"@patternfly/react-code-editor": ">=4.43.16",
"@patternfly/react-core": ">=4.202.16",
"@patternfly/react-table": ">=4.71.16",
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
"@patternfly/patternfly": "^5.0.0-alpha.13",
"@patternfly/react-code-editor": "^5.0.0-alpha.7",
"@patternfly/react-core": "^5.0.0-alpha.7",
"@patternfly/react-table": "^5.0.0-alpha.7",
"react": "^17.0.0 || ^18.0.0",
"react-dom": "^17.0.0 || ^18.0.0"
}
}
20 changes: 20 additions & 0 deletions packages/documentation-framework/versions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
{
"Releases": [
{
"name": "alphas",
"date": "2022-02-08",
"latest": true,
"versions": {
"@patternfly/patternfly": "5.0.0-alpha.13",
"@patternfly/react-catalog-view-extension": "4.95.1",
"@patternfly/react-charts": "7.0.0-alpha.3",
"@patternfly/react-code-editor": "5.0.0-alpha.7",
"@patternfly/react-core": "5.0.0-alpha.7",
"@patternfly/react-icons": "5.0.0-alpha.2",
"@patternfly/react-inline-edit-extension": "4.86.118",
"@patternfly/react-log-viewer": "4.87.100",
"@patternfly/react-styles": "5.0.0-alpha.2",
"@patternfly/react-table": "5.0.0-alpha.7",
"@patternfly/react-tokens": "5.0.0-alpha.2",
"@patternfly/react-topology": "4.91.27",
"@patternfly/react-virtualized-extension": "4.88.113"
}
},
{
"name": "2023.01",
"date": "2022-01-31",
Expand Down
20 changes: 10 additions & 10 deletions packages/v4/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@
"screenshots": "pf-docs-framework screenshots"
},
"dependencies": {
"@patternfly/documentation-framework": "^1.6.0",
"@patternfly/quickstarts": "^2.2.4",
"@patternfly/react-catalog-view-extension": "4.95.2",
"@patternfly/react-docs": "5.103.66",
"@patternfly/documentation-framework": "^2.0.0-alpha.0",
"@patternfly/quickstarts": "^2.3.3",
"@patternfly/react-catalog-view-extension": "4.95.1",
"@patternfly/react-docs": "6.0.0-alpha.8",
"@patternfly/react-log-viewer": "4.87.100",
"@patternfly/react-topology": "^4.91.26",
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
"@patternfly/react-topology": "^4.91.27",
"react": "^17.0.0 || ^18.0.0",
"react-dom": "^17.0.0 || ^18.0.0"
},
"devDependencies": {
"@patternfly/patternfly-a11y": "4.3.0",
"fs-extra": "^9.0.0",
"glob": "^7.1.6"
"@patternfly/patternfly-a11y": "4.3.1",
"fs-extra": "^11.1.0",
"glob": "^8.1.0"
}
}
Loading