From 773203c241806546892c996128a075ede5cac8e7 Mon Sep 17 00:00:00 2001 From: Austin Sullivan Date: Tue, 5 Dec 2023 09:56:33 -0500 Subject: [PATCH 1/2] chore(MissioncControl): onboard to mission control --- .github/workflows/extensions.yml | 16 ------------ .github/workflows/promote.yml | 30 ---------------------- .github/workflows/release.yml | 44 -------------------------------- renovate.json | 26 +++++++++++-------- 4 files changed, 16 insertions(+), 100 deletions(-) delete mode 100644 .github/workflows/extensions.yml delete mode 100644 .github/workflows/promote.yml delete mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/extensions.yml b/.github/workflows/extensions.yml deleted file mode 100644 index a87badcf..00000000 --- a/.github/workflows/extensions.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Add new issues to PatternFly Extensions project - -on: - issues: - types: - - opened - -jobs: - add-to-project: - name: Add issue to project - runs-on: ubuntu-latest - steps: - - uses: actions/add-to-project@v0.3.0 - with: - project-url: https://github.com/orgs/patternfly/projects/12 - github-token: ${{ secrets.GH_PROJECTS }} diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml deleted file mode 100644 index 60134a48..00000000 --- a/.github/workflows/promote.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: promote -on: - push: - # Sequence of patterns matched against refs/tags - tags: - - v5.* -jobs: - build-and-promote: - runs-on: ubuntu-latest - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - steps: - - uses: actions/checkout@v2 - - name: Build for promotion - run: yarn install --frozen-lockfile && yarn build - - uses: actions/setup-node@v3 - with: - node-version: '16.x' - registry-url: 'https://registry.npmjs.org' - - name: GitHub Tag Name example - run: | - echo "Tag name from GITHUB_REF_NAME: $GITHUB_REF_NAME" - echo "Tag name from github.ref_name: ${{ github.ref_name }}" - - name: Manual publish - run: | - cd packages/module - npm version ${{ github.ref_name }} --git-tag-version false - npm publish --tag=latest diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 4504107e..00000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: release -on: - push: - branches: - - main - - v4 -jobs: - call-build-lint-test-workflow: - uses: ./.github/workflows/build-lint-test.yml - deploy: - runs-on: ubuntu-latest - needs: [call-build-lint-test-workflow] - env: - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v3 - with: - node-version: '16' - - uses: actions/cache@v2 - id: npm-cache - name: Cache npm deps - with: - path: | - node_modules - **/node_modules - ~/.cache/Cypress - key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('package-lock.json') }} - - run: npm install --frozen-lockfile - if: steps.npm-cache.outputs.cache-hit != 'true' - - uses: actions/cache@v2 - id: dist - name: Cache dist - with: - path: | - packages/*/dist - packages/react-styles/css - key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('package-lock.json', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }} - - name: Build dist - run: npm run build - if: steps.dist.outputs.cache-hit != 'true' - - name: Release to NPM - run: cd packages/module && npx semantic-release@19.0.5 diff --git a/renovate.json b/renovate.json index b7020ba6..47fab796 100644 --- a/renovate.json +++ b/renovate.json @@ -1,21 +1,27 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:base", - ":dependencyDashboardApproval" - ], + "extends": ["config:base"], + "enabledManagers": ["npm"], + "rangeStrategy": "bump", + "includeForks": true, "packageRules": [ { "packagePatterns": ["*"], - "excludePackagePatterns": [ - "@patternfly/documentation-framework" - ], + "excludePackagePatterns": ["@patternfly/*"], "enabled": false }, { - "packageNames": [ - "@patternfly/documentation-framework" - ] + "datasources": ["npm"], + "packagePatterns": ["@patternfly/*"], + "excludePackageNames": ["@patternfly/documentation-framework", "@patternfly/patternfly-a11y"], + "groupName": "patternfly", + "followTag": "prerelease" + }, + { + "datasources": ["npm"], + "matchPackageNames": ["@patternfly/documentation-framework", "@patternfly/patternfly-a11y"], + "groupName": "patternfly", + "followTag": "latest" } ] } From 2fc94ac7b67a26fdc25511d5ad64580344e0646f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 14:21:12 +0000 Subject: [PATCH 2/2] chore(deps): update dependency @patternfly/documentation-framework to v5 --- package-lock.json | 26 ++++++++++++++------------ packages/module/package.json | 2 +- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index fc12f339..63c63018 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3155,9 +3155,9 @@ } }, "node_modules/@patternfly/ast-helpers": { - "version": "0.4.79", - "resolved": "https://registry.npmjs.org/@patternfly/ast-helpers/-/ast-helpers-0.4.79.tgz", - "integrity": "sha512-Nn2Uut7Z1nQwDr5LAf1bns6yCFQFQWwXE2I1Ucvbk6s2Gl2X/85VGvww8FVO+YiW/plLZMLBFRPJMP4fs2N8Cg==", + "version": "1.3.9", + "resolved": "https://registry.npmjs.org/@patternfly/ast-helpers/-/ast-helpers-1.3.9.tgz", + "integrity": "sha512-D5mPJjTXH4tH2pqM8AcqAUkGZGEXe7RapzLRXR2B6GvJu/luyZSTAoZu5d53d885Pnj1WpyxjcXjWnV222c0TQ==", "dev": true, "dependencies": { "acorn": "^8.4.1", @@ -3168,9 +3168,9 @@ } }, "node_modules/@patternfly/documentation-framework": { - "version": "2.0.0-alpha.62", - "resolved": "https://registry.npmjs.org/@patternfly/documentation-framework/-/documentation-framework-2.0.0-alpha.62.tgz", - "integrity": "sha512-tMg0XsXK+yJAggBxmTZ+wdfnfqwUvbiZ+lXcocM+hVARpHNZhvNDxk8S486lJ98Q3dGDiVaJcI0VOIfyA3Knbw==", + "version": "5.3.9", + "resolved": "https://registry.npmjs.org/@patternfly/documentation-framework/-/documentation-framework-5.3.9.tgz", + "integrity": "sha512-gfmy/0V0EC+FECPld125JcIX5tMt2p27lr+y/UXLGpcljpi04DFpNHfKUY67E0CaJA/9WqjDv08rqum7sweWcg==", "dev": true, "dependencies": { "@babel/core": "7.18.2", @@ -3181,7 +3181,7 @@ "@babel/plugin-transform-react-jsx": "7.17.12", "@babel/preset-env": "7.18.2", "@mdx-js/util": "1.6.16", - "@patternfly/ast-helpers": "^0.4.57", + "@patternfly/ast-helpers": "^1.3.9", "@reach/router": "npm:@gatsbyjs/reach-router@1.3.9", "autoprefixer": "9.8.6", "babel-loader": "9.1.2", @@ -3247,10 +3247,10 @@ "pf-docs-framework": "scripts/cli/cli.js" }, "peerDependencies": { - "@patternfly/patternfly": "^5.0.0-alpha.64", - "@patternfly/react-code-editor": "^5.0.0-alpha.116", - "@patternfly/react-core": "^5.0.0-alpha.115", - "@patternfly/react-table": "^5.0.0-alpha.117", + "@patternfly/patternfly": "5.1.0", + "@patternfly/react-code-editor": "5.1.1", + "@patternfly/react-core": "5.1.1", + "@patternfly/react-table": "5.1.1", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" } @@ -3306,6 +3306,7 @@ "version": "7.20.7", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz", "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.", "dev": true, "dependencies": { "@babel/compat-data": "^7.20.5", @@ -3325,6 +3326,7 @@ "version": "7.17.12", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz", "integrity": "sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead.", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.16.7", @@ -22268,7 +22270,7 @@ "react-jss": "^10.10.0" }, "devDependencies": { - "@patternfly/documentation-framework": "^2.0.0-alpha.57", + "@patternfly/documentation-framework": "^5.3.9", "@patternfly/patternfly": "^5.1.0", "@patternfly/patternfly-a11y": "^4.3.1", "@patternfly/react-code-editor": "^5.1.1", diff --git a/packages/module/package.json b/packages/module/package.json index e419de9d..ffc56ac2 100644 --- a/packages/module/package.json +++ b/packages/module/package.json @@ -43,7 +43,7 @@ }, "devDependencies": { "@patternfly/patternfly-a11y": "^4.3.1", - "@patternfly/documentation-framework": "^2.0.0-alpha.57", + "@patternfly/documentation-framework": "^5.3.9", "@patternfly/patternfly": "^5.1.0", "@patternfly/react-code-editor": "^5.1.1", "@types/react": "^18.2.33",