Skip to content
Open
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
24 changes: 10 additions & 14 deletions .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ name: 'Frodo CLI Release Pipeline'
on:
pull_request:
branches:
- 'main'
- 'trivir'
paths-ignore:
- '**/CODE_OF_CONDUCT.md'
- '**/README.md'
- 'docs/**'
push:
branches:
- 'main'
- 'trivir'
paths-ignore:
- '**/CODE_OF_CONDUCT.md'
- '**/README.md'
Expand Down Expand Up @@ -41,20 +41,24 @@ jobs:
- name: Update package-log.json before version bump
run: npm i --package-lock-only

- name: TriVir changes
run: npm run trivir-frodo-lib

- name: Install dependencies
run: npm ci

- name: 'Prepare Version Bump'
id: version-bump
uses: 'phips28/gh-action-bump-version@master'
with:
version-type: 'prerelease'
major-wording: 'MAJOR RELEASE'
minor-wording: 'MINOR RELEASE'
patch-wording: 'PATCH RELEASE'
rc-wording: ''
tag-prefix: 'v'
default: prerelease
preid: ''
preid: 'trivir'
bump-policy: 'ignore'
skip-commit: 'true'
skip-tag: 'true'
Expand Down Expand Up @@ -176,7 +180,6 @@ jobs:
[
build,
linux-x64-binary-release,
linux-arm64-binary-release,
macos-intel-binary-release,
macos-arm64-binary-release,
npm-release,
Expand Down Expand Up @@ -208,11 +211,6 @@ jobs:
with:
name: linux-x64-binary-release

- name: Download Linux ARM64 Binary Release
uses: actions/download-artifact@v4
with:
name: linux-arm64-binary-release

- name: Download Windows X64 Binary Release
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -266,7 +264,6 @@ jobs:
LICENSE
Release.txt
frodo-linux-x64-${{ needs.build.outputs.newVersion }}.zip
frodo-linux-arm64-${{ needs.build.outputs.newVersion }}.zip
frodo-macos-intel-${{ needs.build.outputs.newVersion }}.zip
frodo-macos-arm64-${{ needs.build.outputs.newVersion }}.zip
frodo-windows-x64-${{ needs.build.outputs.newVersion }}.zip
Expand All @@ -279,7 +276,6 @@ jobs:
[
build,
linux-x64-binary-release,
linux-arm64-binary-release,
macos-intel-binary-release,
macos-arm64-binary-release,
windows-x64-binary-release,
Expand Down Expand Up @@ -321,10 +317,10 @@ jobs:
run: |
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_ACCESS_TOKEN }}" >> ~/.npmrc
npm whoami
npm dist-tag add @rockcarver/frodo-cli@${{ needs.build.outputs.newVersion }} next
npm dist-tag add @trivir/frodo-cli@${{ needs.build.outputs.newVersion }} next

homebrew-formula-update:
if: github.event_name != 'pull_request'
if: false
name: Bump Homebrew formula
needs: [release, build, npm-release]
runs-on: ubuntu-latest
Expand Down Expand Up @@ -547,7 +543,7 @@ jobs:

linux-arm64-binary-release:
# don't run on PRs to speed up the checks
if: github.event_name != 'pull_request'
if: false
needs: [build, test]
runs-on: ubuntu-24.04-arm
steps:
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rockcarver/frodo-cli",
"version": "3.0.5",
"name": "@trivir/frodo-cli",
"version": "3.0.5-trivir.1",
"type": "module",
"description": "A command line interface to manage ForgeRock Identity Cloud tenants, ForgeOps deployments, and classic deployments.",
"keywords": [
Expand Down Expand Up @@ -32,6 +32,8 @@
},
"main": "dist/launch.cjs",
"scripts": {
"rockcarver-frodo-lib": "find src -type f -name \"*.ts\" -exec sed -i \"s#@trivir/frodo-lib#@rockcarver/frodo-lib#g\" {} +",
"trivir-frodo-lib": "npm uninstall @rockcarver/frodo-lib && npm install @trivir/frodo-lib@next && find src -type f -name \"*.ts\" -exec sed -i \"s#@rockcarver/frodo-lib#@trivir/frodo-lib#g\" {} +",
"test": "npm run test:only",
"test:only": "NODE_OPTIONS='--no-warnings --experimental-vm-modules' npx jest --silent",
"test:serial": "NODE_OPTIONS='--no-warnings --experimental-vm-modules' npx jest --silent --runInBand",
Expand Down Expand Up @@ -104,8 +106,8 @@
"package.json",
"cjs/ops/templates/*.json",
"cjs/ops/templates/**/*.json",
"node_modules/@rockcarver/frodo-lib/cjs/ops/templates/*.json",
"node_modules/@rockcarver/frodo-lib/cjs/ops/templates/**/*.json"
"node_modules/@trivir/frodo-lib/cjs/ops/templates/*.json",
"node_modules/@trivir/frodo-lib/cjs/ops/templates/**/*.json"
],
"_scripts": [
"cjs/cli/**/*.js",
Expand All @@ -115,7 +117,7 @@
]
},
"devDependencies": {
"@rockcarver/frodo-lib": "3.1.0",
"@trivir/frodo-lib": "3.1.0-trivir.1",
"@types/colors": "^1.2.1",
"@types/fs-extra": "^11.0.1",
"@types/jest": "^29.2.3",
Expand Down
Loading