This is an automated email from the ASF dual-hosted git repository.
yikun 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 f348d4fb9ff [SPARK-42214][INFRA] Enable infra image build for
scheduled job
f348d4fb9ff is described below
commit f348d4fb9ffabc490b7c5294cd15eed2a74f2b60
Author: Yikun Jiang <yikunk...@gmail.com>
AuthorDate: Sat Jan 28 18:01:57 2023 +0800
[SPARK-42214][INFRA] Enable infra image build for scheduled job
### What changes were proposed in this pull request?
Enable infra image build for scheduled job.
The branch scheduled job is based on master branch workflow, so we need to
enable the infra image for master branch / branch (3.4+). (except 3.2/3.3)
### Why are the changes needed?
Enable infra image build for scheduled job.
### Does this PR introduce _any_ user-facing change?
No, infra only
### How was this patch tested?
- CI passed (to make sure master branch job passed)
- Manually review and check the scheduled job after merge:
https://github.com/apache/spark/actions/workflows/build_branch34.yml
Closes #39778 from Yikun/SPARK-42214.
Authored-by: Yikun Jiang <yikunk...@gmail.com>
Signed-off-by: Yikun Jiang <yikunk...@gmail.com>
---
.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 54b3d1d19d4..021566a5b8e 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -58,8 +58,8 @@ jobs:
required: ${{ steps.set-outputs.outputs.required }}
image_url: >-
${{
- (inputs.branch == 'master' &&
steps.infra-image-outputs.outputs.image_url)
- || 'dongjoon/apache-spark-github-action-image:20220207'
+ ((inputs.branch == 'branch-3.2' || inputs.branch == 'branch-3.3') &&
'dongjoon/apache-spark-github-action-image:20220207')
+ || steps.infra-image-outputs.outputs.image_url
}}
steps:
- name: Checkout Spark repository
@@ -268,12 +268,12 @@ jobs:
infra-image:
name: "Base image build"
needs: precondition
- # Currently, only enable docker build from cache for `master` branch jobs
+ # Currently, enable docker build from cache for `master` and branch (since
3.4) jobs
if: >-
(fromJson(needs.precondition.outputs.required).pyspark == 'true' ||
fromJson(needs.precondition.outputs.required).lint == 'true' ||
fromJson(needs.precondition.outputs.required).sparkr == 'true') &&
- inputs.branch == 'master'
+ (inputs.branch != 'branch-3.2' && inputs.branch != 'branch-3.3')
runs-on: ubuntu-latest
permissions:
packages: write
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
