.github/workflows/cs-update-push.yml

@@ -21,66 +21,47 @@ jobs:
       name: Read the issue comment
       run: |
         ISSUE_COMMENT_STRING='${{ github.event.comment.body }}'
-        TAG=`echo $ISSUE_COMMENT_STRING | jq -r ".tag"`
-        REPO=`echo $ISSUE_COMMENT_STRING | jq -r ".repo"`
-        SENDER=`echo $ISSUE_COMMENT_STRING | jq -r ".sender"`
-        
-        # Try to extract docker_repo from issue comment, fallback to default variable
-        DOCKER_REPO_FROM_COMMENT=`echo $ISSUE_COMMENT_STRING | jq -r ".docker_repo"`
-        if [ -n "$DOCKER_REPO_FROM_COMMENT" ] && [ "$DOCKER_REPO_FROM_COMMENT" != "null" ]; then
-          DOCKER_REPO=$DOCKER_REPO_FROM_COMMENT/$REPO
-          echo "Using docker_repo from issue comment: $DOCKER_REPO"
-        else
-          DOCKER_REPO=${{ vars.docker_repo2_registry }}/$REPO
-          echo "Using fallback docker_repo: $DOCKER_REPO"
-        fi
-        
-        echo "TAG=$TAG" >> "$GITHUB_OUTPUT";
-        echo "REPO=$REPO" >> "$GITHUB_OUTPUT";
-        echo "SENDER=$SENDER" >> "$GITHUB_OUTPUT";
-        echo "DOCKER_REPO=$DOCKER_REPO" >> "$GITHUB_OUTPUT";
+        DOCKER_BASE=`echo $ISSUE_COMMENT_STRING | jq ".image"`
+        BUILD_ID=`echo $ISSUE_COMMENT_STRING | jq ".tag"`
+        echo "DOCKER_BASE=$DOCKER_BASE" >> "$GITHUB_OUTPUT";
+        echo "BUILD_ID=$BUILD_ID" >> "$GITHUB_OUTPUT";
 
     - name: Print IMAGE and TAG
       run: |
-        echo "TAG: ${{ steps.read-issue.outputs.TAG }}"; 
-        echo "REPO: ${{ steps.read-issue.outputs.REPO }}";
-        echo "SENDER: ${{ steps.read-issue.outputs.SENDER }}";
-        echo "DOCKER_REPO: ${{ steps.read-issue.outputs.DOCKER_REPO }}";
+        echo "BUILD_ID: ${{ steps.read-issue.outputs.BUILD_ID }}"; 
+        echo "DOCKER_BASE: ${{ steps.read-issue.outputs.DOCKER_BASE }}";
 
     - name: Checkout cs repo
       uses: actions/checkout@v4
       with:
-        token: ${{ secrets.bot_build_repo_token }} #This is because we want to trigger a new build
         path: cs
-        #Temporary problem git#v2.48.0 - tags aren't fetched with --tags. https://github.com/actions/checkout/issues/2041
-        #fetch-depth: 50 #To get the topmost git tags
-        #fetch-tags: true
-        fetch-depth: 0
+        fetch-depth: 50 #To get the topmost git tags
+        fetch-tags: true
+        token: ${{ secrets.bot_build_repo_token }} #This is because we want to trigger a new build
 
     - name: Checkout deploy-tools
       uses: actions/checkout@v4
       with:
         github-server-url: ${{ github.server_url }}
         repository: gmetribin/deploy-tools
-        ref: v1.1.42
+        ref: v1.1.26
         path: deploy-tools
         # token: $\{{ github.token }} # DEFAULT / Any pushes with github.token don't trigger a chained build
 
-    #To fetch tags correctly: https://github.com/actions/checkout/issues/1471#issuecomment-1755560284
     - name: Increment package version and push
       run: |
         git config --global user.name 'bot-build'
         git config --global user.email 'techbots+build@gmetri.com'
         
-        TAG=${{ steps.read-issue.outputs.TAG }}
-        export REPO=${{ steps.read-issue.outputs.REPO }}
-        export SENDER=${{ steps.read-issue.outputs.SENDER }}
-        DOCKER_REPO=${{ steps.read-issue.outputs.DOCKER_REPO }}
+        BUILD_ID=${{ steps.read-issue.outputs.BUILD_ID }}
+        DOCKER_BASE=${{ steps.read-issue.outputs.DOCKER_BASE }}
         REPOLIST=./.github/repolist.txt
         pwd; ls -al;
         
         cd cs;
-        ../deploy-tools/src/repo_to_cs.sh -m $DOCKER_REPO -t $TAG -r $REPOLIST;
+        pwd;
+        git --no-pager log --oneline --graph --decorate;
+        ../deploy-tools/src/repo_to_cs.sh -m $DOCKER_BASE -t $BUILD_ID -r $REPOLIST;
 
         git push origin main;
         git push --tags origin main;

.github/workflows/cs-update-trigger.yml

@@ -9,10 +9,9 @@ on:
         description: 'The cs repo that contains this image'
         required: true
         type: string
-      docker_repo:
-        description: 'The name of the action variable containing the docker repo value'
-        required: false
-        type: string
+
+env:
+  CS_REPO: ${{ github.repository }}
 
 jobs:
   trigger-cs-job:
@@ -25,19 +24,21 @@ jobs:
       run: |
         SHA=${{ github.sha }}; BRANCH_NAME=${{ github.base_ref || github.ref_name }};
         BUILD_ID=$BRANCH_NAME-${SHA:0:8};
-        REPO=${{ github.repository }};
-        echo "REPO=$REPO" >> "$GITHUB_OUTPUT";
-        echo "TAG=$BUILD_ID" >> "$GITHUB_OUTPUT";
+        DOCKER_BASE=${{ vars.docker_repo2_registry }}/$CS_REPO
+        DOCKER_IMAGE=$DOCKER_BASE:$BUILD_ID;
+        echo "BUILD_ID=$BUILD_ID" >> "$GITHUB_OUTPUT";
+        echo "DOCKER_BASE=$DOCKER_BASE" >> "$GITHUB_OUTPUT";
+        echo "DOCKER_IMAGE=$DOCKER_IMAGE" >> "$GITHUB_OUTPUT";
 
-    - name: Print repo and tag
+    - name: Print build id and image name
       run: |
-        echo "REPO: ${{ steps.get-id.outputs.REPO }}"; 
-        echo "TAG: ${{ steps.get-id.outputs.TAG }}";
+        echo "BUILD_ID: ${{ steps.get-id.outputs.BUILD_ID }}"; 
+        echo "DOCKER_BASE: ${{ steps.get-id.outputs.DOCKER_BASE }}";
+        echo "DOCKER_IMAGE: ${{ steps.get-id.outputs.DOCKER_IMAGE }}";
 
     - name: Push image name and tag to cs repo's latest issue with label workflow
       run: |
-        DOCKER_REPO_VALUE="${{ vars[inputs.docker_repo] }}"
-        ISSUE_COMMENT_STRING=`echo "{ \"docker_repo\": \"$DOCKER_REPO_VALUE\", \"repo\": \"${{ steps.get-id.outputs.REPO }}\", \"tag\": \"${{ steps.get-id.outputs.TAG }}\", \"sender\": \"${{ github.event.sender.login }}\" }" | jq tostring`
+        ISSUE_COMMENT_STRING=`echo "{ \"image\": \"${{ steps.get-id.outputs.DOCKER_BASE }}\", \"tag\": \"${{ steps.get-id.outputs.BUILD_ID }}\" }" | jq tostring`
         echo ISSUE_COMMENT_STRING: $ISSUE_COMMENT_STRING
 
         API_JSON_BODY=`echo '{"body": '$ISSUE_COMMENT_STRING' }' | jq -r tostring`

.github/workflows/nm-update.yml

@@ -61,7 +61,7 @@ jobs:
       with:
         github-server-url: ${{ github.server_url }}
         repository: gmetribin/deploy-tools
-        ref: v1.1.42
+        ref: v1.1.19
         path: deploy-tools
 
     - name: Increment cs version in nm repo and push
@@ -77,6 +77,4 @@ jobs:
         cd nm;
         CS_LIST=./.github/cslist.txt;
         ../deploy-tools/src/cs_to_nm.sh -c ${{ env.CS_REPO }} -v $VERSION -k $CS_LIST;
-        
-        git commit -m "$CS_REPO_NAME to $VERSION by ${{ github.event.sender.login }}"
         git push origin main;

.gitignore

@@ -129,4 +129,4 @@ dist
 .yarn/build-state.yml
 .yarn/install-state.gz
 .pnp.*
-.idea/
+

repo-template/cs-repo/.editorconfig

@@ -0,0 +1,15 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+indent_style = space
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+[*.{js,json,ts,py,sh,md,yml,yaml,njk}]
+charset = utf-8
+indent_size = 2

repo-template/cs-repo/.github/repolist.txt

@@ -0,0 +1,8 @@
+#Place this in .github/repolist.txt
+#repo list
+#FORMAT: image_name       kustomization.yaml_path
+## Used when the main branch of some repo gets built
+
+repo2.hub.gmetri.io/gmetrivr/fs-ui               ui/ui-1main/kustomization.yaml
+repo2.hub.gmetri.io/gmetrivr/fs-learn-ui         ui/ui-1main/kustomization.yaml
+repo2.hub.gmetri.io/gmetrivr/dt-ui               ui/ui-1main/kustomization.yaml

repo-template/cs-repo/.github/workflows/cs-update-push.yml

@@ -0,0 +1,11 @@
+name: Update Repo Version
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+
+  cs-update-push:
+    uses: gmetribin/deploy-tools/.github/workflows/cs-update-push.yml@v1.1.21
+    secrets: inherit

repo-template/cs-repo/.github/workflows/nm-update-1dev.yml

@@ -0,0 +1,14 @@
+name: Deploy to dev
+
+on:
+  workflow_dispatch:
+  push: # Push events on every tag / only for nm-dev
+    tags:        
+      - 'v[0-9]+.[0-9]+.[0-9]+'        
+
+jobs:
+  nm-update-dev:
+    uses: gmetribin/deploy-tools/.github/workflows/nm-update.yml@v1.1.21
+    secrets: inherit
+    with:
+      nm_repo: gmetrivr/nm-dev

repo-template/cs-repo/.github/workflows/nm-update-2rc.yml

@@ -0,0 +1,11 @@
+name: Deploy to rc
+
+on:
+  workflow_dispatch:
+
+jobs:
+  nm-update-rc:
+    uses: gmetribin/deploy-tools/.github/workflows/nm-update.yml@v1.1.21
+    secrets: inherit
+    with:
+      nm_repo: gmetrivr/nm-rc

repo-template/cs-repo/.github/workflows/nm-update-3prod.yml

@@ -0,0 +1,11 @@
+name: Deploy to prod
+
+on:
+  workflow_dispatch:
+
+jobs:
+  nm-update-prod:
+    uses: gmetribin/deploy-tools/.github/workflows/nm-update.yml@v1.1.21
+    secrets: inherit
+    with:
+      nm_repo: gmetrivr/nm-prod

repo-template/cs-repo/.gitignore

@@ -0,0 +1,132 @@
+# ---> Node
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+.cache
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+.idea/

src/cs_to_nm.sh

@@ -34,6 +34,8 @@ main()
     sed -i -e "s/${SEARCH_STRING}.*/${SEARCH_STRING}${VERSION}/" $KUST_PATH
     git add $KUST_PATH
   done <<< "$CSLIST"
+
+  git commit -m "$CS_REPO_NAME updated to $VERSION"
 }
 
 ### Starts here

src/repo_to_cs.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x;
 SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
 echo "Script directory: $SCRIPT_DIR"
 
@@ -38,13 +39,12 @@ main()
     fi
   done <<< "$KUST_FILES_LINES"
 
+  pwd;
   source $SCRIPT_DIR/repo_to_cs_basetag.sh;
-
-  echo "NEW_TAG: $NEW_TAG"
-  COMMIT_MESSAGE="$NEW_TAG: $REPO to $IMAGE_TAG by $SENDER";
-
-  git commit -m "$COMMIT_MESSAGE"
-  git tag -a $NEW_TAG -m "$COMMIT_MESSAGE"
+  # cat $NEW_TAG > version; #To always allow a commit
+  # git add version;
+  git commit -m "$NEW_TAG: $IMAGE updated to $IMAGE_TAG";
+  git tag -a $NEW_TAG -m "$NEW_TAG: $IMAGE updated to $IMAGE_TAG"
 }
 
 ### Starts here

src/repo_to_cs_basetag.sh

@@ -12,7 +12,7 @@
 
 # Based on https://gist.github.com/CSTDev/08c127680e3b5fae38c051da3e489351
 # Commit with a log containing #minor or #major to increment the respective version number
-
+set -x
 #get highest tag number containing at least 2 dots
 VERSION=`git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*\.[0-9]*"`