fix: cleanup integration tests (#582)

google-github-actions · Nov 8, 2022 · 35a5104 · 35a5104
1 parent 75fd574
commit 35a5104
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/.github/workflows/setup-gcloud-it.yml b/.github/workflows/setup-gcloud-it.yml
@@ -17,14 +17,14 @@ jobs:
   versioned:
     if: ${{ github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name && github.actor != 'dependabot[bot]' }}
     name: setup-gcloud versioned
-    runs-on: ${{ matrix.operating-system }}
     strategy:
       fail-fast: false
       matrix:
         os:
           - 'ubuntu-latest'
           - 'windows-latest'
           - 'macos-latest'
+    runs-on: ${{ matrix.os }}
 
     permissions:
       id-token: 'write'
@@ -59,14 +59,14 @@ jobs:
   latest:
     if: ${{ github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name && github.actor != 'dependabot[bot]' }}
     name: setup-gcloud latest
-    runs-on: ${{ matrix.operating-system }}
     strategy:
       fail-fast: false
       matrix:
         os:
           - 'ubuntu-latest'
           - 'windows-latest'
           - 'macos-latest'
+    runs-on: ${{ matrix.os }}
 
     permissions:
       id-token: 'write'
@@ -106,14 +106,14 @@ jobs:
   project_id:
     if: ${{ github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name && github.actor != 'dependabot[bot]' }}
     name: setup-gcloud with configured project
-    runs-on: ${{ matrix.operating-system }}
     strategy:
       fail-fast: false
       matrix:
         os:
           - 'ubuntu-latest'
           - 'windows-latest'
           - 'macos-latest'
+    runs-on: ${{ matrix.os }}
 
     permissions:
       id-token: 'write'
@@ -143,14 +143,14 @@ jobs:
   components:
     if: ${{ github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name && github.actor != 'dependabot[bot]' }}
     name: setup-gcloud with components
-    runs-on: ${{ matrix.operating-system }}
     strategy:
       fail-fast: false
       matrix:
         os:
           - 'ubuntu-latest'
           - 'windows-latest'
           - 'macos-latest'
+    runs-on: ${{ matrix.os }}
 
     permissions:
       id-token: 'write'
@@ -192,7 +192,7 @@ jobs:
   docker:
     if: ${{ github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name && github.actor != 'dependabot[bot]' }}
     name: 'setup-gcloud with docker-based steps'
-    runs-on: 'ubuntu-latest'
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
@@ -234,14 +234,14 @@ jobs:
   wif:
     if: ${{ github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name && github.actor != 'dependabot[bot]' }}
     name: 'with wif'
-    runs-on: '${{ matrix.os }}'
     strategy:
       fail-fast: false
       matrix:
         os:
           - 'ubuntu-latest'
           - 'windows-latest'
           - 'macos-latest'
+    runs-on: '${{ matrix.os }}'
 
     permissions:
       id-token: 'write'
@@ -275,14 +275,14 @@ jobs:
   credentials_json:
     if: ${{ github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name && github.actor != 'dependabot[bot]' }}
     name: 'with key and auth action'
-    runs-on: '${{ matrix.os }}'
     strategy:
       fail-fast: false
       matrix:
         os:
           - 'ubuntu-latest'
           - 'windows-latest'
           - 'macos-latest'
+    runs-on: '${{ matrix.os }}'
 
     permissions:
       id-token: 'write'
@@ -315,14 +315,14 @@ jobs:
   credentials_json_exported:
     if: ${{ github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name && github.actor != 'dependabot[bot]' }}
     name: 'auth action with json key and setup-gcloud export'
-    runs-on: '${{ matrix.os }}'
     strategy:
       fail-fast: false
       matrix:
         os:
           - 'ubuntu-latest'
           - 'windows-latest'
           - 'macos-latest'
+    runs-on: '${{ matrix.os }}'
 
     steps:
       - uses: 'actions/checkout@v3'
@@ -341,8 +341,6 @@ jobs:
 
       - name: 'setup-gcloud'
         uses: './'
-        with:
-          export_default_credentials: true
 
       - id: 'gcloud'
         shell: 'bash'
@@ -352,14 +350,14 @@ jobs:
   multi_credentials:
     if: ${{ github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name && github.actor != 'dependabot[bot]' }}
     name: 'with two setup gcloud with different SA'
-    runs-on: '${{ matrix.os }}'
     strategy:
       fail-fast: false
       matrix:
         os:
           - 'ubuntu-latest'
           - 'windows-latest'
           - 'macos-latest'
+    runs-on: '${{ matrix.os }}'
 
     permissions:
       id-token: 'write'
@@ -396,8 +394,6 @@ jobs:
         uses: ./
         with:
           version: 'latest'
-          service_account_email: ${{ secrets.SETUP_GCLOUD_IT_EMAIL }}
-          service_account_key: ${{ secrets.SETUP_GCLOUD_IT_KEY }}
 
       # current SA should be SETUP_GCLOUD_IT_EMAIL
       - name: 'check current SA'