@genesislcap/blank-app-seed 3.29.1-prerelease.3 → 3.29.1-prerelease.4

package/.genx/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/blank-app-seed-config",
   "description": "Genesis Blank App Seed Configuration",
-  "version": "3.29.1-prerelease.3",
+  "version": "3.29.1-prerelease.4",
   "license": "Apache-2.0",
   "scripts": {
     "lint": "eslint .",

package/.genx/scripts/update-versions.js

@@ -4,23 +4,30 @@ const { resolve } = require('node:path');
 const current = require('../versions.json');
 
 const args = process.argv.slice(2);
-const patchOnly = args.indexOf("--patch-only") >= 0;
-const dryRun = args.indexOf("--dry-run") >= 0;
 
-const VERSION_REGEX = /\d+$/;
+const argDefined = (name) => args.indexOf(name) >= 0;
+
+const patchOnly = argDefined("--patch-only");
+const dryRun = argDefined("--dry-run");
+const skipServer = argDefined("--skip-server");
 
-const jfrogVersionMatcher = patchOnly ? current.GSF.replace(VERSION_REGEX, '*') : undefined;
+const VERSION_REGEX = /\d+$/;
+const JFROG_BASE_EXCLUSIONS = '*-SNAPSHOT*;*maven-metadata*;*test*;*TEST*';
 
-const npmVersionMatcher = patchOnly ? current.UI.replace(VERSION_REGEX, 'x') : 'latest';
+const { jfrogVersionMatcher, jfrogExclusionsMatcher, npmVersionMatcher } = patchOnly
+  ? { jfrogVersionMatcher: current.GSF.replace(VERSION_REGEX, '*'), jfrogExclusionsMatcher: `*-beta*;*-RC*;${JFROG_BASE_EXCLUSIONS}`, npmVersionMatcher: current.UI.replace(VERSION_REGEX, 'x') }
+  : { jfrogVersionMatcher: undefined, jfrogExclusionsMatcher: JFROG_BASE_EXCLUSIONS, npmVersionMatcher: 'latest' };
 
-console.log('Running with: ', {patchOnly, dryRun, npmVersionMatcher, jfrogVersionMatcher})
+console.log('Running with: ', { patchOnly, skipServer, dryRun, npmVersionMatcher, jfrogVersionMatcher, jfrogExclusionsMatcher });
 
-const run = (command) =>
-  execSync(command, {
+const run = (command) => {
+  console.debug('running:', command);
+  return execSync(command, {
     stdio: ['pipe', 'pipe', 'ignore'],
   })
     .toString('utf8')
     .trim();
+};
 
 const writeJSON = (json, path) => {
   const data = JSON.stringify(json, null, 2) + '\n';
@@ -32,15 +39,38 @@ const writeJSON = (json, path) => {
   }
 };
 
-const UI = run(`npm info @genesislcap/foundation-ui@${npmVersionMatcher} version`);
+/**
+ * NPM Info returns a string if there's only one version in the channel;, otherwise it returns a valid json array,
+ * where the most recent version will be the last value;
+ * @param {*} output 
+ * @returns 
+ */
+const parseNpmInfo = (output) => {
+  try {
+    const versions = JSON.parse(output);
+    return Array.isArray(versions) ? versions[versions.length-1] : versions;
+  } catch (err) {
+    return output;
+  }
+}
+
+const npmInfo = run(`npm info @genesislcap/foundation-ui@${npmVersionMatcher} version --json`);
+console.debug('Npm raw output:', npmInfo);
+const UI = parseNpmInfo(npmInfo);
+
+const serverOsCommandPipeline = `grep path | tr -s ' ' | sed 's/"path": //g' | awk -F'/' '{print $(NF-1)}' | sort -V | tail -n 1`;
 
-const GSF = run(
-  `jf rt s "libs-release-client/global/genesis/genesis-distribution/${jfrogVersionMatcher ?? ''}" --exclusions="*-RC*;*-SNAPSHOT*;*maven-metadata*;*test*;*TEST*" | grep path | tr -s ' ' | sed 's/"path": //g' | awk -F'/' '{print $(NF-1)}' | sort -V | tail -n 1`,
-);
+const { GSF, Auth } = skipServer
+  ? { GSF: current.GSF, Auth: current.Auth }
+  : {
+    GSF: run(
+      `jf rt s "libs-release-client/global/genesis/genesis-distribution/${jfrogVersionMatcher ?? ''}" --exclusions="${jfrogExclusionsMatcher}" | ${serverOsCommandPipeline}`
+    ),
+    Auth: run(
+      `jf rt s "libs-release-client/global/genesis/auth-distribution/${jfrogVersionMatcher ?? ''}" --exclusions="${jfrogExclusionsMatcher}" | ${serverOsCommandPipeline}`,
+    )
+  };
 
-const Auth = run(
-  `jf rt s "libs-release-client/global/genesis/auth-distribution/${jfrogVersionMatcher ?? ''}" --exclusions="*-RC*;*-SNAPSHOT*;*maven-metadata*;*test*;*TEST*" | grep path | tr -s ' ' | sed 's/"path": //g' | awk -F'/' '{print $(NF-1)}' | sort -V | tail -n 1`,
-);
 const latest = { UI, GSF, Auth };
 
 console.log('Current:', current);

package/.genx/versions.json

@@ -1,5 +1,5 @@
 {
   "UI": "14.200.0",
-  "GSF": "8.2.4",
-  "Auth": "8.2.1"
+  "GSF": "8.3.0-beta0",
+  "Auth": "8.3.0-beta0"
 }

package/.github/workflows/slack.yml

@@ -2,7 +2,7 @@ name: Slack PR notification
 
 on:
   pull_request:
-    branches: [main]
+    branches: [main, prerelease]
     types: [opened, reopened]
 
 jobs:

package/.github/workflows/upgrade.yml

@@ -11,6 +11,10 @@ on:
         type: boolean
         required: false
         description: Only update if there are newer patch versions
+      skip-server:
+        type: boolean
+        required: false
+        description: Skip updating server dependencies
     secrets:
       GH_USER_TOKEN:
         required: true
@@ -26,6 +30,7 @@ jobs:
     env:
       BRANCH: ${{ inputs.branch }}
       PATCH_ARG: ${{ inputs.patch-only && '--patch-only' || '' }}
+      SKIP_SERVER_ARG: ${{ inputs.skip-server && '--skip-server' || '' }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -47,7 +52,7 @@ jobs:
           jfrog config add --artifactory-url="https://genesisglobal.jfrog.io/artifactory" --user="${{ secrets.JFROG_LIBS_RELEASE_CLIENT_RO_USER }}" --password="${{ secrets.JFROG_LIBS_RELEASE_CLIENT_RO_KEY }}" --interactive=false
 
       - name: Update to latest versions if available
-        run: node .genx/scripts/update-versions ${PATCH_ARG}
+        run: node .genx/scripts/update-versions ${PATCH_ARG} ${SKIP_SERVER_ARG}
 
       - name: Check for changes
         id: versions

package/.github/workflows/upgrade_prerelease.yml

@@ -12,6 +12,7 @@ jobs:
     uses: ./.github/workflows/upgrade.yml
     with: 
       branch: prerelease
+      skip-server: true
     secrets:
       GH_USER_TOKEN: ${{ secrets.GH_USER_TOKEN }}
       JFROG_LIBS_RELEASE_CLIENT_RO_USER: ${{ secrets.JFROG_LIBS_RELEASE_CLIENT_RO_USER }}

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [3.29.1-prerelease.4](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.29.1-prerelease.3...v3.29.1-prerelease.4) (2024-08-16)
+
+
+### Bug Fixes
+
+* updating server version information for GSF [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) 872539b
+
 ## [3.29.1-prerelease.3](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.29.1-prerelease.2...v3.29.1-prerelease.3) (2024-08-15)
 
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/blank-app-seed",
   "description": "Genesis Blank App Seed",
-  "version": "3.29.1-prerelease.3",
+  "version": "3.29.1-prerelease.4",
   "license": "Apache-2.0",
   "scripts": {
     "release": "semantic-release"