zhengruifeng commented on code in PR #56201:
URL: https://github.com/apache/spark/pull/56201#discussion_r3355644431


##########
.github/workflows/build_and_test.yml:
##########
@@ -382,11 +382,10 @@ jobs:
       uses: actions/cache@v5
       with:
         path: ~/.cache/coursier
-        key: ${{ matrix.java }}-${{ matrix.hadoop }}-coursier-${{ 
hashFiles('**/pom.xml', '**/plugins.sbt') }}
+        key: ${{ runner.os }}-${{ matrix.java }}-${{ matrix.hadoop 
}}-coursier-${{ hashFiles('**/pom.xml', '**/plugins.sbt') }}
         restore-keys: |
-          ${{ matrix.java }}-${{ matrix.hadoop }}-coursier-
-          precompile-coursier-${{ hashFiles('**/pom.xml', '**/plugins.sbt') }}
-          precompile-coursier-
+          ${{ runner.os }}-${{ matrix.java }}-${{ matrix.hadoop }}-coursier-
+          coursier-

Review Comment:
   Done in the latest push — the build job's restore-key chain is now:
   ```
   ${{ runner.os }}-${{ matrix.java }}-${{ matrix.hadoop }}-coursier-   # own 
stale entry
   ${{ runner.os }}-coursier-                                              # 
precompile's prefix
   ```
   The second entry matches the precompile-written key `${{ runner.os 
}}-coursier-\<hash\>` via prefix matching, so the precompile cache is still 
consulted as a fallback.



##########
.github/workflows/build_and_test.yml:
##########
@@ -1433,15 +1432,13 @@ jobs:
         key: build-${{ hashFiles('**/pom.xml', 'project/build.properties', 
'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 
'build/spark-build-info') }}
         restore-keys: |
           build-
-    - name: Cache Coursier local repository
-      uses: actions/cache@v5
+    - name: Restore Coursier local repository

Review Comment:
   Fixed by 
[SPARK-57142](https://github.com/apache/spark/commit/5ec09fee3bf2696e672fe1f9cd141a60c22bcd25)
 which was merged before this PR. `tpcds-1g` now depends on `precompile`, so it 
always waits for `precompile` to finish (and its cache to be saved) before 
starting. The restore-only approach is fully valid.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to