use generated directories

BBBmau · Mar 11, 2024 · 9314bbf · 9314bbf
1 parent d6dedaf
commit 9314bbf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/teamcity-services-diff-check-weekly.yml b/.github/workflows/teamcity-services-diff-check-weekly.yml
@@ -23,16 +23,18 @@ jobs:
           with:
             repo: 'terraform-provider-google'
             token: '$GITHUB_TOKEN'
+        - run: export GOOGLE_REPO_PATH=$OUTPUT_PATH
         - name: TeamCity Google Beta Provider Generate
           uses: ./.github/actions/build-downstream
           with:
             repo: 'terraform-provider-google-beta'
             token: '$GITHUB_TOKEN'
+        - run: export GOOGLE_BETA_REPO_PATH=$OUTPUT_PATH
         - name: Check that new services have been added to the TeamCity configuration code
           run: |
               # Create lists of service packages in providers
-              ls provider/google/services > tools/teamcity-diff-check/services_ga.txt
-              ls provider/google-beta/services > tools/teamcity-diff-check/services_beta.txt
+              ls ${GOOGLE_REPO_PATH}/google/services > tools/teamcity-diff-check/services_ga.txt
+              ls ${GOOGLE_BETA_REPO_PATH}/google-beta/services > tools/teamcity-diff-check/services_beta.txt
     
               # Run tool to compare service packages in the providers vs those listed in TeamCity config files
               cd tools/teamcity-diff-check

diff --git a/.github/workflows/teamcity-services-diff-check.yml b/.github/workflows/teamcity-services-diff-check.yml
@@ -33,21 +33,23 @@ jobs:
         with:
           repo: 'terraform-provider-google'
           token: '$GITHUB_TOKEN'
+      - run: export GOOGLE_REPO_PATH=$OUTPUT_PATH
       - name: TeamCity Google Beta Provider Generate
         if: steps.generate.outcome == 'success'
         uses: ./.github/actions/build-downstream
         with:
           repo: 'terraform-provider-google-beta'
           token: '$GITHUB_TOKEN'
+      - run: export GOOGLE_BETA_REPO_PATH=$OUTPUT_PATH
       - name: Checkout Repository
         if: steps.generate.outcome == 'success'
         uses: actions/checkout@v4
       - name: Check that new services have been added to the TeamCity configuration code
         if: steps.generate.outcome == 'success'
         run: |
           # Create lists of service packages in providers
-          ls provider/google/services > tools/teamcity-diff-check/services_ga.txt
-          ls provider/google-beta/services > tools/teamcity-diff-check/services_beta.txt
+          ls ${GOOGLE_REPO_PATH}/google/services > tools/teamcity-diff-check/services_ga.txt
+          ls ${GOOGLE_BETA_REPO_PATH}/google-beta/services > tools/teamcity-diff-check/services_beta.txt
 
           # Run tool to compare service packages in the providers vs those listed in TeamCity config files
           cd tools/teamcity-diff-check