fix workflow vars (#7853)

Azure · Aug 5, 2024 · 11c9198 · 11c9198
1 parent dc9f923
commit 11c9198
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/.github/workflows/ProcessCodeReview.yml b/.github/workflows/ProcessCodeReview.yml
@@ -59,7 +59,7 @@ jobs:
             echo "changed_module_list=$(cat changed_files | grep azext_ | awk -F"azext_" '{print $1}'| awk -F"/" '{print $2}' | sort | uniq | xargs)" >> $GITHUB_ENV
       - name: Display Diff Modules
         run: |
-            for mod in "$changed_module_list"
+            for mod in ${changed_module_list[@]}
             do
               echo changed module: "${mod}"
             done

diff --git a/.github/workflows/VersionCalPRComment.yml b/.github/workflows/VersionCalPRComment.yml
@@ -1,4 +1,4 @@
-name: Generate Release Version and Comment PR
+name: Release Version Calculation
 
 on:
   workflow_dispatch:
@@ -54,37 +54,40 @@ jobs:
         env:
           bash_sha: ${{ github.event.pull_request.base.sha }}
           base_branch: ${{ github.event.pull_request.base.ref }}
+          base_repo: ${{ github.event.pull_request.base.repo.clone_url }}
           base_branch_pre: "upstream"
           diff_code_file: "diff_codes.txt"
           diff_sha: ${{ github.event.pull_request.head.sha }}
           diff_branch: ${{ github.event.pull_request.head.ref }}
           repo_full_name: ${{ github.event.pull_request.head.repo.full_name }}
         run: |
-            set -x
-            git --version
-            git log --oneline | head -n 30
-            git branch -a
-            git fetch https://github.com/Azure/azure-cli-extensions.git "$base_branch":"$base_branch_pre"/"$base_branch"
-            git checkout "$base_branch_pre"/"$base_branch"
-            git log --oneline | head -n 30
-            git checkout "$diff_branch"
-            git log --oneline | head -n 30
-            git --no-pager diff --name-only --diff-filter=ACMRT "$base_branch_pre"/"$base_branch"..."$diff_branch" > changed_files
-            cat changed_files
-            cat changed_files | grep azext_ | awk -F"azext_" '{print $1}'| awk -F"/" '{print $2}' | sort | uniq > changed_modules
-            echo "changed_module_list=$(cat changed_files | grep azext_ | awk -F"azext_" '{print $1}'| awk -F"/" '{print $2}' | sort | uniq | xargs)" >> $GITHUB_ENV
-            git --no-pager diff --diff-filter=ACMRT "$base_branch_pre"/"$base_branch"..."$diff_branch" > "$diff_code_file"
+          set -x
+          git --version
+          git log --oneline | head -n 10
+          git branch -a
+          git fetch "$base_repo" "$base_branch":"$base_branch_pre"/"$base_branch"
+          git checkout "$base_branch_pre"/"$base_branch"
+          git log --oneline | head -n 10
+          git checkout "$diff_branch"
+          git log --oneline | head -n 10
+          git --no-pager diff --name-only --diff-filter=ACMRT "$base_branch_pre"/"$base_branch"..."$diff_branch" | grep -v "/tests/" > changed_files
+          cat changed_files
+          cat changed_files | grep src/ | awk -F"src/" '{print $2}'| grep / | awk -F"/" '{print $1}' | sort | uniq
+          echo "changed_module_list=$(cat changed_files | grep src/ | awk -F"src/" '{print $2}'| grep / | awk -F"/" '{print $1}' | sort | uniq)" >> $GITHUB_ENV
+          git --no-pager diff --diff-filter=ACMRT "$base_branch_pre"/"$base_branch"..."$diff_branch" > "$diff_code_file"
       - name: Display PR Diff Modules
         run: |
           for mod in ${changed_module_list[@]}
           do
             echo changed module: "${mod}"
           done
-          if [ ${#changed_module_list[@]} -eq 0 ]; then
+          if [ -z "$changed_module_list" ]; then
             echo "no_changed_mod=true" >> $GITHUB_ENV
           else
             echo "no_changed_mod=false" >> $GITHUB_ENV
           fi
+          echo array length
+          echo ${#changed_module_list[@]}
       - name: Checkout CLI main repo
         if: ${{ env.no_changed_mod == 'false' }}
         uses: actions/checkout@v4