Merge pull request #81 from NIDAP-Community/dev

Dev

Author: ruiheesi

.github/workflows/Append_File_On_Merged_to_Main.yml

@@ -24,11 +24,11 @@ jobs:
           cd $current_wd
           
           export MY_GIT_TOKEN=${{secrets.GITHUB_TOKEN}}
-          export MY_GIT_USERNAME=${{secrets.GIT_USERNAME}}
-          export MY_GIT_EMAIL=${{secrets.GIT_EMAIL}}
+          export MY_GIT_USERNAME=${{ github.actor }}
+          export MY_GIT_EMAIL=${{ github.event.pusher.email }}
           
-          git config --global user.name $MY_GIT_USERNAME
-          git config --global user.email $MY_GIT_EMAIL
+          git config --global user.name "$MY_GIT_USERNAME"
+          git config --global user.email "$MY_GIT_EMAIL"
           git config --global url."https://api:[email protected]/".insteadOf "https://github.com/"
           git config --global url."https://ssh:[email protected]/".insteadOf "ssh://[email protected]/"
           git config --global url."https://git:[email protected]/".insteadOf "[email protected]:"
@@ -54,9 +54,10 @@ jobs:
           echo "Performing check now"
           export nothing_for_commit="$(grep -Po "nothing to commit" commit_log.log)"
           
-          if [ -z "$nothing_for_commit" ]; then
-            echo "Commit check failed: $nothing_for_commit" 
+          if [ -n "${nothing_for_commit}" ]; then
+            echo "Commit check failed with message: $nothing_for_commit" 
           else
+            echo "Pushing changes now."
             git push -f origin main
           fi
           

.github/workflows/Check_On_Commit.yml

@@ -34,18 +34,19 @@ jobs:
           
           bash $current_wd/.github/workflows/Check_on_Commit.sh "$current_wd"
           
+          
       - name: Undo Push
         if: ${{ failure() }}
         run: |
           export current_wd="/__w/${GITHUB_REPOSITORY#*/}/${GITHUB_REPOSITORY#*/}"
           echo "$current_wd"
           
           export MY_GIT_TOKEN=${{secrets.GITHUB_TOKEN}}
-          export MY_GIT_USERNAME=${{secrets.GIT_USERNAME}}
-          export MY_GIT_EMAIL=${{secrets.GIT_EMAIL}}
+          export MY_GIT_USERNAME=${{ github.actor }}
+          export MY_GIT_EMAIL=${{ github.event.pusher.email }}
           
-          git config --global user.name $MY_GIT_USERNAME
-          git config --global user.email $MY_GIT_EMAIL
+          git config --global user.name "$MY_GIT_USERNAME"
+          git config --global user.email "$MY_GIT_EMAIL"
           git config --global url."https://api:[email protected]/".insteadOf "https://github.com/"
           git config --global url."https://ssh:[email protected]/".insteadOf "ssh://[email protected]/"
           git config --global url."https://git:[email protected]/".insteadOf "[email protected]:"

README.md

@@ -1,5 +1,8 @@
 # CCBR-GitHub-Playground
 This training repo is for CCBR internal devs to familiarize with GitHub operation
 
-1. Modify Readme to Test
-  Initial testing 2_1_23
+1. Modify the function codes to test commit action.
+2. Modify the test function codes to test commit action.
+3. Merge feature to dev, and create pull request from dev to release to test merge to release action.
+4. Create pull request release to main to test the check on merge to main action.
+5. Merge the release to main, this will trigger automatic file generation action.