From 905cf87868ca23e7bc72a6cf286ba794cf75363e Mon Sep 17 00:00:00 2001
From: Scott Suarez <ScottSuarez@google.com>
Date: Tue, 7 Nov 2023 11:10:52 -0800
Subject: [PATCH] fix test cache issue.. unify go-setup command (#9398)

---
 .github/workflows/test-tgc.yml | 4 ++--
 .github/workflows/test-tpg.yml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-tgc.yml b/.github/workflows/test-tgc.yml
index 7d33f3cbc60c..e1654f092c1e 100644
--- a/.github/workflows/test-tgc.yml
+++ b/.github/workflows/test-tgc.yml
@@ -79,9 +79,9 @@ jobs:
         }'
     - name: Set up Go
       if: ${{ !failure() && steps.pull_request.outputs.has_changes == 'true' }}
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v3
       with:
-        go-version: '^1.19.9'
+        go-version: '^1.19'
     - name: Build Terraform Google Conversion
       if: ${{ !failure() && steps.pull_request.outputs.has_changes == 'true' }}
       run: |
diff --git a/.github/workflows/test-tpg.yml b/.github/workflows/test-tpg.yml
index 3b0c3f2fa822..de61efccb631 100644
--- a/.github/workflows/test-tpg.yml
+++ b/.github/workflows/test-tpg.yml
@@ -47,7 +47,7 @@ jobs:
         path: |
           ~/go/pkg/mod
           ~/.cache/go-build
-        key: ${{ runner.os }}-test-${{ github.event.inputs.repo }}-${{hashFiles('go.sum','google-beta/transport/**','google-beta/tpgresource/**','google-beta/acctest/**','google-beta/envvar/**','google-beta/sweeper/**','google-beta/verify/**') }}
+        key: ${{ runner.os }}-test-${{ github.event.inputs.repo }}-${{hashFiles('go.sum','google-*/transport/**','google-*/tpgresource/**','google-*/acctest/**','google-*/envvar/**','google-*/sweeper/**','google-*/verify/**') }}
         restore-keys: |
           ${{ runner.os }}-test-${{ github.event.inputs.repo }}-${{ hashFiles('go.sum') }}
           ${{ runner.os }}-test-${{ github.event.inputs.repo }}-
@@ -80,9 +80,9 @@ jobs:
         }'
     - name: Set up Go
       if: ${{ !failure() && steps.pull_request.outputs.has_changes == 'true' }}
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v3
       with:
-        go-version: '^1.19.1'
+        go-version: '^1.19'
     - name: Build Provider
       if: ${{ !failure() && steps.pull_request.outputs.has_changes == 'true' }}
       run: |