This is an automated email from the ASF dual-hosted git repository.
ruifengz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 241454253a73 [SPARK-50590][INFRA][FOLLOW-UP] Further skip unnecessary
image build by the job modules
241454253a73 is described below
commit 241454253a73b7dfe641d85784d8855504ca59b7
Author: Ruifeng Zheng <[email protected]>
AuthorDate: Wed Dec 25 15:16:27 2024 +0800
[SPARK-50590][INFRA][FOLLOW-UP] Further skip unnecessary image build by the
job modules
### What changes were proposed in this pull request?
Further skip unnecessary image build by the job modules
### Why are the changes needed?
e.g. in a case where `sparkr` is not enabled, do not need to build the
corresponding image
### Does this PR introduce _any_ user-facing change?
no, infra-only
### How was this patch tested?
pr builder
### Was this patch authored or co-authored using generative AI tooling?
no
Closes #49281 from zhengruifeng/infra_further_skip.
Authored-by: Ruifeng Zheng <[email protected]>
Signed-off-by: Ruifeng Zheng <[email protected]>
---
.github/workflows/build_and_test.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/build_and_test.yml
b/.github/workflows/build_and_test.yml
index 9900fbf6d82c..13f4e66842ef 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -435,7 +435,7 @@ jobs:
# Use the infra image cache to speed up
cache-from:
type=registry,ref=ghcr.io/apache/spark/apache-spark-github-action-image-cache:${{
inputs.branch }}
- name: Build and push (Documentation)
- if: ${{ inputs.branch != 'branch-3.5' &&
hashFiles('dev/spark-test-image/docs/Dockerfile') != '' }}
+ if: ${{ inputs.branch != 'branch-3.5' &&
fromJson(needs.precondition.outputs.required).docs == 'true' &&
hashFiles('dev/spark-test-image/docs/Dockerfile') != '' }}
id: docker_build_docs
uses: docker/build-push-action@v6
with:
@@ -446,7 +446,7 @@ jobs:
# Use the infra image cache to speed up
cache-from:
type=registry,ref=ghcr.io/apache/spark/apache-spark-github-action-image-docs-cache:${{
inputs.branch }}
- name: Build and push (Linter)
- if: ${{ inputs.branch != 'branch-3.5' &&
hashFiles('dev/spark-test-image/lint/Dockerfile') != '' }}
+ if: ${{ inputs.branch != 'branch-3.5' &&
fromJson(needs.precondition.outputs.required).lint == 'true' &&
hashFiles('dev/spark-test-image/lint/Dockerfile') != '' }}
id: docker_build_lint
uses: docker/build-push-action@v6
with:
@@ -457,7 +457,7 @@ jobs:
# Use the infra image cache to speed up
cache-from:
type=registry,ref=ghcr.io/apache/spark/apache-spark-github-action-image-lint-cache:${{
inputs.branch }}
- name: Build and push (SparkR)
- if: ${{ inputs.branch != 'branch-3.5' &&
hashFiles('dev/spark-test-image/sparkr/Dockerfile') != '' }}
+ if: ${{ inputs.branch != 'branch-3.5' &&
fromJson(needs.precondition.outputs.required).sparkr == 'true' &&
hashFiles('dev/spark-test-image/sparkr/Dockerfile') != '' }}
id: docker_build_sparkr
uses: docker/build-push-action@v6
with:
@@ -468,7 +468,7 @@ jobs:
# Use the infra image cache to speed up
cache-from:
type=registry,ref=ghcr.io/apache/spark/apache-spark-github-action-image-sparkr-cache:${{
inputs.branch }}
- name: Build and push (PySpark with ${{ env.PYSPARK_IMAGE_TO_TEST }})
- if: ${{ inputs.branch != 'branch-3.5' && env.PYSPARK_IMAGE_TO_TEST !=
'' }}
+ if: ${{ inputs.branch != 'branch-3.5' &&
fromJson(needs.precondition.outputs.required).pyspark == 'true' &&
env.PYSPARK_IMAGE_TO_TEST != '' }}
id: docker_build_pyspark
env: ${{ fromJSON(inputs.envs) }}
uses: docker/build-push-action@v6
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
