diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 0ee5bff20..b278598e6 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -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' @@ -41,6 +41,9 @@ 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 @@ -48,13 +51,14 @@ jobs: 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' @@ -176,7 +180,6 @@ jobs: [ build, linux-x64-binary-release, - linux-arm64-binary-release, macos-intel-binary-release, macos-arm64-binary-release, npm-release, @@ -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: @@ -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 @@ -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, @@ -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 @@ -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: diff --git a/package-lock.json b/package-lock.json index ba28246f6..a639f302b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { - "name": "@rockcarver/frodo-cli", - "version": "3.0.5", + "name": "@trivir/frodo-cli", + "version": "3.0.5-trivir.1", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "@rockcarver/frodo-cli", - "version": "3.0.5", + "name": "@trivir/frodo-cli", + "version": "3.0.5-trivir.1", "license": "MIT", "dependencies": { "deep-diff": "^1.0.2", @@ -16,7 +16,7 @@ "frodo": "dist/launch.cjs" }, "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", @@ -1847,9 +1847,9 @@ "url": "https://opencollective.com/unts" } }, - "node_modules/@rockcarver/frodo-lib": { + "node_modules/@trivir/frodo-lib": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@rockcarver/frodo-lib/-/frodo-lib-3.1.0.tgz", + "resolved": "https://registry.npmjs.org/@trivir/frodo-lib/-/frodo-lib-3.1.0-trivir.1.tgz", "integrity": "sha512-ruThNiJovUtfbr/V7bACo6ezwa58kONmWtTBWcPLrWYA58vDa5OYI6WHqPturmFW4ee1yGAb63w6hFynM0E9qA==", "dev": true, "license": "MIT", diff --git a/package.json b/package.json index fbda1b494..d081cdb25 100644 --- a/package.json +++ b/package.json @@ -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": [ @@ -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", @@ -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", @@ -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",