Skip to content

Commit c1e08d2

Browse files
committed
[SPARK-51990] Use Swift docker image on Linux environments
### What changes were proposed in this pull request? This PR aims to use `Swift` docker image instead of `setup-swift` on Linux environments ### Why are the changes needed? To make Linux CIs more stable. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass the CIs. ### Was this patch authored or co-authored using generative AI tooling? No. Closes apache#106 from dongjoon-hyun/SPARK-51990. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent bb8b9fb commit c1e08d2

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

.github/workflows/build_and_test.yml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,8 @@ jobs:
3939
with:
4040
config: .github/.licenserc.yaml
4141

42-
build:
43-
runs-on: ${{ matrix.os }}
44-
strategy:
45-
fail-fast: false
46-
matrix:
47-
os:
48-
- ubuntu-latest
49-
- macos-15
42+
build-macos-15:
43+
runs-on: macos-15
5044
steps:
5145
- uses: actions/checkout@v4
5246
- uses: swift-actions/setup-swift@d10500c1ac8822132eebbd74c48c3372c71d7ff5
@@ -55,6 +49,15 @@ jobs:
5549
- name: Build
5650
run: swift build -v
5751

52+
build-ubuntu-latest:
53+
runs-on: ubuntu-latest
54+
steps:
55+
- uses: actions/checkout@v4
56+
- name: Build
57+
run: |
58+
docker run swift:6.1 uname -a
59+
docker run -v $PWD:/spark -w /spark swift:6.1 swift build -v
60+
5861
# setup-swift doesn't support ARM linux yet.
5962
build-ubuntu-arm:
6063
runs-on: ubuntu-24.04-arm
@@ -63,7 +66,7 @@ jobs:
6366
- name: Build
6467
run: |
6568
docker run swift:6.1 uname -a
66-
docker run -v $PWD:/orc -w /orc swift:6.1 swift build -v
69+
docker run -v $PWD:/spark -w /spark swift:6.1 swift build -v
6770
6871
integration-test-linux:
6972
runs-on: ubuntu-latest
@@ -79,11 +82,10 @@ jobs:
7982
options: --entrypoint /opt/spark/sbin/start-connect-server.sh
8083
steps:
8184
- uses: actions/checkout@v4
82-
- uses: swift-actions/setup-swift@d10500c1ac8822132eebbd74c48c3372c71d7ff5
83-
with:
84-
swift-version: "6.1"
85-
- name: Test
86-
run: swift test --no-parallel
85+
- name: Build
86+
run: |
87+
docker run swift:6.1 uname -a
88+
docker run --add-host=host.docker.internal:host-gateway -v $PWD:/spark -w /spark -e SPARK_REMOTE='sc://host.docker.internal:15003' swift:6.1 swift test --no-parallel
8789
8890
integration-test-mac:
8991
runs-on: macos-15

0 commit comments

Comments
 (0)