From dd88a3cefd7944b996bcb6f4b219036e9f24eb22 Mon Sep 17 00:00:00 2001 From: Volker Scheuber Date: Thu, 20 Jun 2024 00:10:20 -0500 Subject: [PATCH 1/5] drop binary nodes version back down to 18 until we can upgrade arm64 runner --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b8f16a1f..35db94f0 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "build": "npm run build:binary", "build:only": "npx tsup && npx tsc", "build:binary": "npm run build:only && npm run dist-pkg", - "dist-pkg": "pkg -C Gzip -t node20 --config package.json -o frodo dist/app.cjs", + "dist-pkg": "pkg -C Gzip -t node18 --config package.json -o frodo dist/app.cjs", "link": "npm link ../frodo-lib", "dev": "npx tsup --watch src" }, From e6be7f51c0198979a303ea233b756fea3833e266 Mon Sep 17 00:00:00 2001 From: Volker Scheuber Date: Thu, 20 Jun 2024 00:11:10 -0500 Subject: [PATCH 2/5] fix pipeline issues caused by breaking changes in newer action versions --- .github/workflows/pipeline.yml | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 78bf8405..b00c9704 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -181,9 +181,25 @@ jobs: with: name: build - - uses: actions/download-artifact@v4 + - name: Download MacOS Binary Release + uses: actions/download-artifact@v4 + with: + name: macos-binary-release + + - name: Download Linux Binary Release + uses: actions/download-artifact@v4 + with: + name: linux-binary-release + + - name: Download Linux Arm64 Binary Release + uses: actions/download-artifact@v4 + with: + name: linux-arm64-binary-release + + - name: Download Windows Binary Release + uses: actions/download-artifact@v4 with: - name: dist + name: windows-binary-release - name: 'Github SHA' id: github-sha @@ -221,7 +237,7 @@ jobs: git push - name: Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: name: Frodo CLI ${{ needs.build.outputs.newVersion }} tag_name: ${{ needs.build.outputs.newTag }} @@ -385,7 +401,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: dist + name: macos-binary-release path: frodo-macos-${{ needs.build.outputs.newVersion }}.zip linux-binary-release: @@ -422,7 +438,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: dist + name: linux-binary-release path: frodo-linux-${{ needs.build.outputs.newVersion }}.zip linux-arm64-binary-release: @@ -461,7 +477,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: dist + name: linux-arm64-binary-release path: frodo-linux-arm64-${{ needs.build.outputs.newVersion }}.zip windows-binary-release: @@ -499,5 +515,5 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: dist + name: windows-binary-release path: frodo-win-${{ needs.build.outputs.newVersion }}.zip From 27ad1f4d3f395f12413b0375d849ee15b1cab060 Mon Sep 17 00:00:00 2001 From: Volker Scheuber Date: Thu, 20 Jun 2024 00:11:18 -0500 Subject: [PATCH 3/5] update readme --- .github/README.md | 10 ++++------ README.md | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/README.md b/.github/README.md index 19b20cca..a33eae75 100644 --- a/.github/README.md +++ b/.github/README.md @@ -1,7 +1,9 @@ # Frodo CLI (@rockcarver/frodo-cli) - Export, import, and manage PingOne Advanced Identity Cloud configuration -A command line interface to manage ForgeRock platform deployments supporting PingOne Advanced Identity Cloud environments, ForgeOps deployments, and classic deployments. Frodo-cli is powered by [frodo-lib](https://github.com/rockcarver/frodo-lib), a hybrid (ESM and CJS) library to manage ForgeRock deployments. + +A command line interface to manage PingOne Advanced Identity Cloud environments, ForgeOps deployments, and classic deployments. Frodo-cli is powered by [frodo-lib](https://github.com/rockcarver/frodo-lib), a hybrid (ESM and CJS) library to manage PingOne Advanced Identity Cloud environments, ForgeOps deployments, and classic deployments. + ## Quick Nav - [Quick start](#quick-start) @@ -144,7 +146,7 @@ Individuals who do not intend to develop or contribute to frodo should use this For those who want to contribute or are just curious about the build process. -- Make sure you have Node.js v14, v16, or v18 installed ([support for node 19](https://github.com/rockcarver/frodo-cli/issues/186) is pending). +- Make sure you have **Node.js 18**, **20**, or **22** installed. - Clone this repo ```console git clone https://github.com/rockcarver/frodo-cli.git @@ -164,10 +166,6 @@ If you are a node developer and want to use frodo as a cli tool or as a library ```console npm i -g @rockcarver/frodo-cli ``` -- To install (or update to) the latest version as a dependency for you own application: - ```console - npm i --save @rockcarver/frodo-cli - ``` - To install (or update to) the latest pre-release: ```console npm i @rockcarver/frodo-cli@next diff --git a/README.md b/README.md index f670f18f..202a2d62 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Frodo Command Line Interface -ForgeROck DO Command Line Interface, frodo-cli, a CLI to manage ForgeRock platform deployments supporting Identity Cloud tenants, ForgeOps deployments, and classic deployments. +A command line interface to manage PingOne Advanced Identity Cloud environments, ForgeOps deployments, and classic deployments. -Frodo is the successor to field tools like [amtree.sh](https://github.com/vscheuber/AM-treetool), [fidc-debug-tools](https://github.com/vscheuber/fidc-debug-tools), and ForgeRock-internal utilities. +Frodo is the successor to field tools like [amtree.sh](https://github.com/vscheuber/AM-treetool), [fidc-debug-tools](https://github.com/vscheuber/fidc-debug-tools), and Ping/ForgeRock-internal utilities. Please refer to the [GitHub README](https://github.com/rockcarver/frodo-cli#readme) for full documentation. From d19c73dbb4a14c42fd3e7b0b5e18c8259513565c Mon Sep 17 00:00:00 2001 From: Volker Scheuber Date: Thu, 20 Jun 2024 00:28:11 -0500 Subject: [PATCH 4/5] update to frodo-lib 2.0.0-87 --- CHANGELOG.md | 4 ++++ package.json | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2dad67e1..e603fb6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- Update to frodo-lib 2.0.0-87 + ## [2.0.0-62] - 2024-06-19 ### Changed diff --git a/package.json b/package.json index 35db94f0..c6fd4abf 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,8 @@ "type": "module", "description": "A command line interface to manage ForgeRock Identity Cloud tenants, ForgeOps deployments, and classic deployments.", "keywords": [ + "ping", + "pingone", "forgerock", "cli", "am", @@ -12,13 +14,14 @@ "openidm", "forgeops", "identity cloud", + "advanced identity cloud", "export", "import", "ci/cd", "devops" ], "engines": { - "node": ">=16" + "node": ">=18.17.0" }, "repository": { "type": "git", @@ -110,7 +113,7 @@ ] }, "devDependencies": { - "@rockcarver/frodo-lib": "2.0.0-86", + "@rockcarver/frodo-lib": "2.0.0-87", "@types/colors": "^1.2.1", "@types/fs-extra": "^11.0.1", "@types/jest": "^29.2.3", From 51f845221cc4a6033212e5e35984f0aa87d75751 Mon Sep 17 00:00:00 2001 From: Volker Scheuber Date: Thu, 20 Jun 2024 00:32:42 -0500 Subject: [PATCH 5/5] fix package-lock.json issue --- .github/workflows/pipeline.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index b00c9704..cc40ad48 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -38,6 +38,9 @@ jobs: node-version: ${{ env.NODE_VERSION }} cache: 'npm' + - name: Update package-log.json before version bump + run: npm i --package-lock-only + - name: Install dependencies run: npm ci @@ -59,7 +62,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Update package-log.json + - name: Update package-log.json after version bump run: npm i --package-lock-only - name: 'Version From Tag'