yml tweaks

Author: dconeybe

.github/workflows/dataconnect_demo_app.yml

@@ -19,6 +19,8 @@ env:
   FDC_NODE_VERSION: ${{ inputs.nodeVersion || '20' }}
   FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '13.25.0' }}
   FDC_JAVA_VERSION: ${{ inputs.javaVersion || '17' }}
+  FDC_FIREBASE_TOOLS_DIR: ${{ github.workspace }}/firebase-tools
+  FDC_FIREBASE_COMMAND: ${{ github.workspace }}/firebase-tools/bin/node_modules/.bin/firebase
 
 defaults:
   run:
@@ -40,15 +42,15 @@ jobs:
 
       - name: Create Cache Key Files
         run: |
-          echo "x366vcw7mg" >github_actions_demo_assemble_cache_key.txt
+          echo "x366vcw7mg" >github_actions_demo_test_cache_key.txt
           echo "${{ env.FDC_FIREBASE_TOOLS_VERSION }}" >github_actions_demo_assemble_firebase_tools_version.txt
 
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ env.FDC_NODE_VERSION }}
           cache: 'npm'
           cache-dependency-path: |
-            firebase-dataconnect/demo/github_actions_demo_assemble_cache_key.txt
+            firebase-dataconnect/demo/github_actions_demo_test_cache_key.txt
             firebase-dataconnect/demo/github_actions_demo_assemble_firebase_tools_version.txt
 
       - name: cache package-lock.json
@@ -61,8 +63,9 @@ jobs:
       - name: install firebase-tools from scratch
         if: steps.package_json_lock.outputs.cache-hit != 'true'
         run: |
-          mkdir firebase-tools
-          cd firebase-tools
+          set -v
+          mkdir -p ${{ env.FDC_FIREBASE_TOOLS_DIR }}
+          cd ${{ env.FDC_FIREBASE_TOOLS_DIR }}
           echo '{}' > package.json
           npm install --fund=false --audit=false --save --save-exact firebase-tools@${{ env.FDC_FIREBASE_TOOLS_VERSION }}
 
@@ -81,7 +84,7 @@ jobs:
             firebase-dataconnect/demo/build.gradle.kts
             firebase-dataconnect/demo/gradle.properties
             firebase-dataconnect/demo/gradle/wrapper/gradle-wrapper.properties
-            firebase-dataconnect/demo/github_actions_demo_assemble_cache_key.txt
+            firebase-dataconnect/demo/github_actions_demo_test_cache_key.txt
 
       - name: tool versions
         continue-on-error: true
@@ -94,7 +97,7 @@ jobs:
           which node
           node --version
           which firebase
-          firebase --version
+          ${{ env.FDC_FIREBASE_COMMAND }} --version
           ./gradlew --version
 
       - name: ./gradlew assemble test
@@ -104,7 +107,7 @@ jobs:
           --no-daemon \
           ${{ (inputs.gradleInfoLog && '--info') || '' }} \
           --profile \
-          -PdataConnect.minimalApp.firebaseCommand="$PWD/firebase-tools/node_modules/.bin/firebase" \
+          -PdataConnect.minimalApp.firebaseCommand="${{ env.FDC_FIREBASE_COMMAND }} \
           assemble test
 
       - uses: actions/upload-artifact@v4