sync up to orcid source and add second project

.github/workflows/bld_maven.yml → .github/workflows/bld_mvn.yml

@@ -1,5 +1,4 @@
-name: bld_maven
-run-name: bld-{{ inputs.project }}
+name: bld_mvn
 
 permissions:
   checks: write
@@ -83,7 +82,13 @@ on:
 
 
 jobs:
-  bld_maven:
+  bld_mvn:
+    strategy:
+      matrix:
+        include:
+          - project: hello_world
+          - project: hello_world_2
+
     runs-on: ubuntu-latest
     steps:
       - name: git-checkout-ref-action
@@ -167,20 +172,20 @@ jobs:
           find . -name '*.war'
           find . -name '*.jar'
         env:
-          project: "${{ inputs.project }}"
+          project: "${{ matrix.project }}"
 
 #
 # orcid-web customization
 #
 
       - name: setup node for angular static file
-        if: ${{ inputs.project == 'orcid-web' }}
+        if: ${{ matrix.project == 'orcid-web' }}
         uses: actions/setup-node@v3
         with:
           node-version: 18.7.0
 
       - name: build angular parts if we are building orcid-web
-        if: ${{ inputs.project == 'orcid-web' }}
+        if: ${{ matrix.project == 'orcid-web' }}
         run: |
           echo "Build angular_orcid_generated.js"
           cd orcid-nodejs
@@ -208,7 +213,7 @@ jobs:
 
         env:
           version_tag_numeric: "${{ steps.version.outputs.version_tag_numeric }}"
-          project: "${{ inputs.project }}"
+          project: "${{ matrix.project }}"
 
 ##################################################################################################################
 
@@ -227,5 +232,5 @@ jobs:
           ARTIFACT_REPO_PATH: "${{ secrets.ARTIFACT_REPO_PATH }}"
           ARTIFACT_USER: "${{ secrets.ARTIFACT_USER }}"
           ARTIFACT_PASSWORD: "${{ secrets.ARTIFACT_PASSWORD }}"
-          project: "${{ inputs.project }}"
+          project: "${{ matrix.project }}"
 

.github/workflows/build_test_release_tag.yml → .github/workflows/bld_test_rel_tag.yml

@@ -1,4 +1,4 @@
-name: build_test_release_tag
+name: bld_test_rel_tag
 
 on:
   workflow_call:
@@ -18,6 +18,11 @@ on:
         required: false
         default: "default"
         type: string
+      rel_tag:
+        description: Whether to tag the code
+        type: boolean
+        required: false
+        default: true
 
   workflow_dispatch:
     inputs:
@@ -42,7 +47,11 @@ on:
         required: false
         default: "default_branch"
         type: string
-
+      rel_tag:
+        description: Whether to tag the code
+        type: boolean
+        required: false
+        default: true
 
 # cancel running job if another commit comes in
 concurrency:
@@ -54,8 +63,8 @@ jobs:
   lint:
     uses: ./.github/workflows/lint.yml
 
-  mvn_test:
-    uses: ./.github/workflows/mvn_test.yml
+  test_mvn:
+    uses: ./.github/workflows/test_mvn.yml
     with:
       version_tag: ${{ inputs.version_tag }}
       bump: ${{ inputs.bump }}
@@ -65,12 +74,12 @@ jobs:
     needs:
       - lint
 ##############################################################################
-  bld_all:
-    uses: ./.github/workflows/bld_all.yml
+  bld_mvn:
+    uses: ./.github/workflows/bld_mvn.yml
     secrets: inherit # pass all secrets for uploading assets
     needs:
       - lint
-      - mvn_test
+      - test_mvn
     permissions:
       checks: write
       contents: read
@@ -87,7 +96,8 @@ jobs:
 
   rel_tag:
     uses: ./.github/workflows/rel_tag.yml
-    needs: bld_all
+    needs: bld_mvn
+    if: ${{ inputs.rel_tag }}
     with:
       version_tag: ${{ inputs.version_tag }}
       bump: ${{ inputs.bump }}