abhinav-phi commented on PR #19986:
URL: https://github.com/apache/hudi/pull/19986#issuecomment-6926214944
@voonhous the branch is rebased on master and the conflict is resolved — it
was your own commit that caused it.
`88b20661a16` ("chore(ci): fold Java CI Engines into Java CI", #20655)
deleted `.github/workflows/java_ci_engines.yml` and moved its five jobs into
`bot.yml`. The spark archive cache steps lived in that file, so the merge had a
modify/delete conflict.
What I did:
- the Restore / Fetch / Verify-and-extract / Save Spark archive steps moved
with the job into the Java CI integration-test job in `bot.yml`, unchanged
otherwise — same cache key `spark-archive-v1-${{ runner.os }}-${{
matrix.sparkArchive }}`, same `$HOME/spark-archives` path, same sha512
verification on both the restored and the downloaded path, and Save still sits
right after a successful `tar -xf` and before `mvn verify`.
- the purge-exception pointer comment follows the key, so it is now next to
the `spark-archive-v1-` key in `bot.yml` instead of in the deleted file.
- `scheduled_workflow.yml` no longer points at `java_ci_engines.yml`; it
names `bot.yml` as the place the spark archives live. The Trino pointers still
point at `hudi_trino_ci.yml` and `hudi_trino_compat.yml`, and the filter is
still anchored on the version-independent prefixes `^spark-archive-` and
`^trino-m2-`.
The diff is now four files, the same shape as before: `bot.yml`,
`hudi_trino_ci.yml`, `hudi_trino_compat.yml`, `scheduled_workflow.yml`.
All six of your comments are answered, the two majors included. The tracking
issue for the validation gap is #20011, as you suggested.
--
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]