do PR suggestion

hashicorp · Sep 18, 2023 · b068727 · b068727
1 parent 6226420
commit b068727
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/.github/scripts/filter_changed_files_go_test.sh b/.github/scripts/filter_changed_files_go_test.sh
@@ -4,10 +4,10 @@
 
 set -euo pipefail
 
-GITHUB_BRANCH=""
+BRANCH=""
 
 # Get the list of changed files
-files_to_check=$(git diff --name-only origin/$GITHUB_BRANCH)
+files_to_check=$(git diff --name-only origin/$BRANCH)
 
 # Define the directories to check
 skipped_directories=("docs/" "ui/" "website/" "grafana/" ".github/")

diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml
@@ -39,20 +39,10 @@ jobs:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
         with:
           fetch-depth: 0  
-      - name: Set Variable
-        id: set-variable
-        run: |
-          if [[ "${{ github.event.pull_request.merged }}" == "true" ]]; then
-            echo "GITHUB_BRANCH=${{ github.ref_name }}" >> "${GITHUB_ENV}"
-            echo "branch: $GITHUB_BRANCH"
-          else
-            echo "GITHUB_BRANCH=${{ github.head_ref }}" >> "${GITHUB_ENV}"
-            echo "branch: $GITHUB_BRANCH"
-          fi
       - name: Get changed files
         id: read-files
         env:
-          GITHUB_BRANCH: "$GITHUB_BRANCH"
+          BRANCH: ${{ github.head_ref || github.ref_name }}
         run: ./.github/scripts/filter_changed_files_go_test.sh
 
   setup: