Per #2118, updates to set_job_controls.sh over from bugfix_2118_main_…

…v10.1_grib1_rotll to this branch to also fix it in develop.
dtcenter · Apr 8, 2022 · 759a626 · 759a626
1 parent fd7bdb4
commit 759a626
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/.github/jobs/set_job_controls.sh b/.github/jobs/set_job_controls.sh
@@ -17,9 +17,11 @@ if [ "${GITHUB_EVENT_NAME}" == "pull_request" ]; then
 
     run_diff=true
 
-    # if base branch starts with main_v, use that input data
+    # if pull request into main_vX.Y branch,
+    # set truth data version to branch name and set input data version to X.Y
     if [ "${GITHUB_BASE_REF:0:6}" == "main_v" ]; then
-	input_data_version=${GITHUB_BASE_REF:6}
+      truth_data_version=${GITHUB_BASE_REF}
+      input_data_version=${GITHUB_BASE_REF:6}
     fi
 
   fi
@@ -35,9 +37,9 @@ elif [ "${GITHUB_EVENT_NAME}" == "push" ]; then
     run_diff=true
     truth_data_version=${branch_name:0: -4}
 
-    # if branch starts with main_v, use that input data
+    # if main_vX.Y-ref branch, use X.Y input data
     if [ "${branch_name:0:6}" == "main_v" ]; then
-      input_data_version=${branch_name:6:-4}
+      input_data_version=${branch_name:6: -4}
     fi
 
   else
@@ -46,10 +48,10 @@ elif [ "${GITHUB_EVENT_NAME}" == "push" ]; then
     if [ "$branch_name" == "develop" ] ||
        [ "${branch_name:0:6}" == "main_v" ]; then
 
-       run_diff=true
-       truth_data_version=${branch_name}
+      run_diff=true
+      truth_data_version=${branch_name}
 
-      # if branch starts with main_v, use that input data
+      # if main_vX.Y branch, use X.Y input data
       if [ "${branch_name:0:6}" == "main_v" ]; then
         input_data_version=${branch_name:6}
       fi
@@ -59,34 +61,34 @@ elif [ "${GITHUB_EVENT_NAME}" == "push" ]; then
     # check commit messages for skip or force keywords                                                                         
     if grep -q "ci-skip-all" <<< "$commit_msg"; then
 
-       run_compile=false
-       run_push=false
-       run_unit_tests=false
-       run_diff=false
-       run_update_truth=false
+      run_compile=false
+      run_push=false
+      run_unit_tests=false
+      run_diff=false
+      run_update_truth=false
 
     fi    
 
     # check commit messages for ci-skip or ci-run keywords
     if grep -q "ci-skip-compile" <<< "$commit_msg"; then
 
-       run_compile=false
+      run_compile=false
 
     fi
 
     if grep -q "ci-run-unit" <<< "$commit_msg"; then
 
-       run_diff=true
+      run_diff=true
 
     fi
 
   fi
 
 elif [ "${GITHUB_EVENT_NAME}" == "workflow_dispatch" ]; then
 
-    if [ "${force_tests}" == "true" ]; then
-        run_diff=true
-    fi
+  if [ "${force_tests}" == "true" ]; then
+    run_diff=true
+  fi
 
 fi