Skip to content

Commit

Permalink
Merge pull request #397 from vscheuber/main
Browse files Browse the repository at this point in the history
fix pipeline
  • Loading branch information
vscheuber committed Jun 20, 2024
2 parents fae35f6 + 51f8452 commit 6f4b259
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 19 deletions.
10 changes: 4 additions & 6 deletions .github/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<!-- README.md for GitHub; the one for NPM is ../README.md. -->

# 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)
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
35 changes: 27 additions & 8 deletions .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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'
Expand Down Expand Up @@ -181,9 +184,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
Expand Down Expand Up @@ -221,7 +240,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 }}
Expand Down Expand Up @@ -385,7 +404,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:
Expand Down Expand Up @@ -422,7 +441,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:
Expand Down Expand Up @@ -461,7 +480,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:
Expand Down Expand Up @@ -499,5 +518,5 @@ jobs:

- uses: actions/upload-artifact@v4
with:
name: dist
name: windows-binary-release
path: frodo-win-${{ needs.build.outputs.newVersion }}.zip
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!-- README.md for NPM; the one for GitHub is .github/README.md. -->
# 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.
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -37,7 +40,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"
},
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 6f4b259

Please sign in to comment.