Skip to content

Commit c663e72

Browse files
dongjoon-hyundongjoon-hyun
committed
[SPARK-56126][INFRA][4.1] Sync docker-related GitHub Actions versions to the ASF approved patterns
### What changes were proposed in this pull request? This PR aims to sync `docker`-related GitHub Actions versions to the ASF approved patterns. ### Why are the changes needed? Currently, the `branch-4.1` CI is blocked by the ASF check because of the recent change. - https://github.com/apache/spark/actions/workflows/build_branch41_non_ansi.yml - https://github.com/apache/spark/actions/runs/23370546081 > The actions docker/login-actionv3, docker/setup-qemu-actionv3, docker/setup-buildx-actionv3, and docker/build-push-actionv6 are not allowed in apache/spark because all actions must be from a repository owned by your enterprise, created by GitHub, or match one of the patterns: This is due to the following change. - apache/infrastructure-actions#547 As of now, the updated patterns are the following. - https://github.com/apache/infrastructure-actions/blob/07f5f9d2b05fe0ec9886e3ef0a9d79797817f0cb/approved_patterns.yml#L100-L104 ``` - docker/build-push-action10e90e3645eae34f1e60eeb005ba3a3d33f178e8 - docker/login-actionc94ce9fb468520275223c153574b00df6fe4bcc9 - docker/metadata-actionc299e40c65443455700f0fdfc63efafe5b349051 - docker/setup-buildx-action8d2750c68a42422c14e847fe6c8ac0403b4cbd6f - docker/setup-qemu-action29109295f81e9208d7d86ff1c6c12d2833863392 ``` ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Manually check like the following because the updated CI should be triggered manually. ``` $ git grep 'uses: docker' | sort | uniq -c 5 .github/workflows/build_and_test.yml: uses: docker/build-push-action10e90e3645eae34f1e60eeb005ba3a3d33f178e8 1 .github/workflows/build_and_test.yml: uses: docker/login-actionc94ce9fb468520275223c153574b00df6fe4bcc9 1 .github/workflows/build_and_test.yml: uses: docker/setup-buildx-action8d2750c68a42422c14e847fe6c8ac0403b4cbd6f 1 .github/workflows/build_and_test.yml: uses: docker/setup-qemu-action29109295f81e9208d7d86ff1c6c12d2833863392 15 .github/workflows/build_infra_images_cache.yml: uses: docker/build-push-action10e90e3645eae34f1e60eeb005ba3a3d33f178e8 1 .github/workflows/build_infra_images_cache.yml: uses: docker/login-actionc94ce9fb468520275223c153574b00df6fe4bcc9 1 .github/workflows/build_infra_images_cache.yml: uses: docker/setup-buildx-action8d2750c68a42422c14e847fe6c8ac0403b4cbd6f 1 .github/workflows/build_infra_images_cache.yml: uses: docker/setup-qemu-action29109295f81e9208d7d86ff1c6c12d2833863392 ``` ### Was this patch authored or co-authored using generative AI tooling? Generated-by: Claude Code (claude-opus-4-6) Closes #54936 from dongjoon-hyun/SPARK-56126-4.1. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent 32d5313 commit c663e72

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

‎.github/workflows/build_and_test.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ jobs:
412412
packages: write
413413
steps:
414414
- name: Login to GitHub Container Registry
415-
uses: docker/login-action@v3
415+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9
416416
with:
417417
registry: ghcr.io
418418
username: ${{ github.actor }}
@@ -432,13 +432,13 @@ jobs:
432432
git -c user.name='Apache Spark Test Account' -c user.email='[email protected]' merge --no-commit --progress --squash FETCH_HEAD
433433
git -c user.name='Apache Spark Test Account' -c user.email='[email protected]' commit -m "Merged commit" --allow-empty
434434
- name: Set up QEMU
435-
uses: docker/setup-qemu-action@v3
435+
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392
436436
- name: Set up Docker Buildx
437-
uses: docker/setup-buildx-action@v3
437+
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f
438438
- name: Build and push for branch-3.5
439439
if: inputs.branch == 'branch-3.5'
440440
id: docker_build
441-
uses: docker/build-push-action@v6
441+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
442442
with:
443443
context: ./dev/infra/
444444
push: true
@@ -449,7 +449,7 @@ jobs:
449449
- name: Build and push (Documentation)
450450
if: ${{ inputs.branch != 'branch-3.5' && fromJson(needs.precondition.outputs.required).docs == 'true' && hashFiles('dev/spark-test-image/docs/Dockerfile') != '' }}
451451
id: docker_build_docs
452-
uses: docker/build-push-action@v6
452+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
453453
with:
454454
context: ./dev/spark-test-image/docs/
455455
push: true
@@ -460,7 +460,7 @@ jobs:
460460
- name: Build and push (Linter)
461461
if: ${{ inputs.branch != 'branch-3.5' && fromJson(needs.precondition.outputs.required).lint == 'true' && hashFiles('dev/spark-test-image/lint/Dockerfile') != '' }}
462462
id: docker_build_lint
463-
uses: docker/build-push-action@v6
463+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
464464
with:
465465
context: ./dev/spark-test-image/lint/
466466
push: true
@@ -471,7 +471,7 @@ jobs:
471471
- name: Build and push (SparkR)
472472
if: ${{ inputs.branch != 'branch-3.5' && fromJson(needs.precondition.outputs.required).sparkr == 'true' && hashFiles('dev/spark-test-image/sparkr/Dockerfile') != '' }}
473473
id: docker_build_sparkr
474-
uses: docker/build-push-action@v6
474+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
475475
with:
476476
context: ./dev/spark-test-image/sparkr/
477477
push: true
@@ -483,7 +483,7 @@ jobs:
483483
if: ${{ inputs.branch != 'branch-3.5' && (fromJson(needs.precondition.outputs.required).pyspark == 'true' || fromJson(needs.precondition.outputs.required).pyspark-pandas == 'true') && env.PYSPARK_IMAGE_TO_TEST != '' }}
484484
id: docker_build_pyspark
485485
env: ${{ fromJSON(inputs.envs) }}
486-
uses: docker/build-push-action@v6
486+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
487487
with:
488488
context: ./dev/spark-test-image/${{ env.PYSPARK_IMAGE_TO_TEST }}/
489489
push: true

‎.github/workflows/build_infra_images_cache.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,18 @@ jobs:
5555
- name: Checkout Spark repository
5656
uses: actions/checkout@v4
5757
- name: Set up QEMU
58-
uses: docker/setup-qemu-action@v3
58+
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392
5959
- name: Set up Docker Buildx
60-
uses: docker/setup-buildx-action@v3
60+
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f
6161
- name: Login to DockerHub
62-
uses: docker/login-action@v3
62+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9
6363
with:
6464
registry: ghcr.io
6565
username: ${{ github.actor }}
6666
password: ${{ secrets.GITHUB_TOKEN }}
6767
- name: Build and push
6868
id: docker_build
69-
uses: docker/build-push-action@v6
69+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
7070
with:
7171
context: ./dev/infra/
7272
push: true
@@ -78,7 +78,7 @@ jobs:
7878
- name: Build and push (Documentation)
7979
if: hashFiles('dev/spark-test-image/docs/Dockerfile') != ''
8080
id: docker_build_docs
81-
uses: docker/build-push-action@v6
81+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
8282
with:
8383
context: ./dev/spark-test-image/docs/
8484
push: true
@@ -91,7 +91,7 @@ jobs:
9191
- name: Build and push (Linter)
9292
if: hashFiles('dev/spark-test-image/lint/Dockerfile') != ''
9393
id: docker_build_lint
94-
uses: docker/build-push-action@v6
94+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
9595
with:
9696
context: ./dev/spark-test-image/lint/
9797
push: true
@@ -104,7 +104,7 @@ jobs:
104104
- name: Build and push (SparkR)
105105
if: hashFiles('dev/spark-test-image/sparkr/Dockerfile') != ''
106106
id: docker_build_sparkr
107-
uses: docker/build-push-action@v6
107+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
108108
with:
109109
context: ./dev/spark-test-image/sparkr/
110110
push: true
@@ -117,7 +117,7 @@ jobs:
117117
- name: Build and push (PySpark with old dependencies)
118118
if: hashFiles('dev/spark-test-image/python-minimum/Dockerfile') != ''
119119
id: docker_build_pyspark_python_minimum
120-
uses: docker/build-push-action@v6
120+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
121121
with:
122122
context: ./dev/spark-test-image/python-minimum/
123123
push: true
@@ -130,7 +130,7 @@ jobs:
130130
- name: Build and push (PySpark PS with old dependencies)
131131
if: hashFiles('dev/spark-test-image/python-ps-minimum/Dockerfile') != ''
132132
id: docker_build_pyspark_python_ps_minimum
133-
uses: docker/build-push-action@v6
133+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
134134
with:
135135
context: ./dev/spark-test-image/python-ps-minimum/
136136
push: true
@@ -143,7 +143,7 @@ jobs:
143143
- name: Build and push (PySpark with PyPy 3.10)
144144
if: hashFiles('dev/spark-test-image/pypy-310/Dockerfile') != ''
145145
id: docker_build_pyspark_pypy_310
146-
uses: docker/build-push-action@v6
146+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
147147
with:
148148
context: ./dev/spark-test-image/pypy-310/
149149
push: true
@@ -156,7 +156,7 @@ jobs:
156156
- name: Build and push (PySpark with Python 3.10)
157157
if: hashFiles('dev/spark-test-image/python-310/Dockerfile') != ''
158158
id: docker_build_pyspark_python_310
159-
uses: docker/build-push-action@v6
159+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
160160
with:
161161
context: ./dev/spark-test-image/python-310/
162162
push: true
@@ -169,7 +169,7 @@ jobs:
169169
- name: Build and push (PySpark with Python 3.11)
170170
if: hashFiles('dev/spark-test-image/python-311/Dockerfile') != ''
171171
id: docker_build_pyspark_python_311
172-
uses: docker/build-push-action@v6
172+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
173173
with:
174174
context: ./dev/spark-test-image/python-311/
175175
push: true
@@ -182,7 +182,7 @@ jobs:
182182
- name: Build and push (PySpark Classic Only with Python 3.11)
183183
if: hashFiles('dev/spark-test-image/python-311-classic-only/Dockerfile') != ''
184184
id: docker_build_pyspark_python_311_classic_only
185-
uses: docker/build-push-action@v6
185+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
186186
with:
187187
context: ./dev/spark-test-image/python-311-classic-only/
188188
push: true
@@ -195,7 +195,7 @@ jobs:
195195
- name: Build and push (PySpark with Python 3.12)
196196
if: hashFiles('dev/spark-test-image/python-312/Dockerfile') != ''
197197
id: docker_build_pyspark_python_312
198-
uses: docker/build-push-action@v6
198+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
199199
with:
200200
context: ./dev/spark-test-image/python-312/
201201
push: true
@@ -208,7 +208,7 @@ jobs:
208208
- name: Build and push (PySpark with Python 3.13)
209209
if: hashFiles('dev/spark-test-image/python-313/Dockerfile') != ''
210210
id: docker_build_pyspark_python_313
211-
uses: docker/build-push-action@v6
211+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
212212
with:
213213
context: ./dev/spark-test-image/python-313/
214214
push: true
@@ -221,7 +221,7 @@ jobs:
221221
- name: Build and push (PySpark with Python 3.13 no GIL)
222222
if: hashFiles('dev/spark-test-image/python-313-nogil/Dockerfile') != ''
223223
id: docker_build_pyspark_python_313_nogil
224-
uses: docker/build-push-action@v6
224+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
225225
with:
226226
context: ./dev/spark-test-image/python-313-nogil/
227227
push: true
@@ -234,7 +234,7 @@ jobs:
234234
- name: Build and push (PySpark with Python 3.14)
235235
if: hashFiles('dev/spark-test-image/python-314/Dockerfile') != ''
236236
id: docker_build_pyspark_python_314
237-
uses: docker/build-push-action@v6
237+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
238238
with:
239239
context: ./dev/spark-test-image/python-314/
240240
push: true
@@ -247,7 +247,7 @@ jobs:
247247
- name: Build and push (PySpark with Numpy 2.1.3)
248248
if: hashFiles('dev/spark-test-image/numpy-213/Dockerfile') != ''
249249
id: docker_build_pyspark_numpy_213
250-
uses: docker/build-push-action@v6
250+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
251251
with:
252252
context: ./dev/spark-test-image/numpy-213/
253253
push: true

0 commit comments

Comments
 (0)
⚡