Skip to content

Commit 256caed

Browse files
fix: clickhouse using CI services
1 parent 773fb22 commit 256caed

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

.github/workflows/test.yml

+8-10
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ on:
99
env:
1010
swift_package_resolve: swift package resolve
1111
swift_build: swift build --build-tests
12-
swift_test: CLICKHOUSE_SERVER="127.0.0.1" CLICKHOUSE_USER="default" CLICKHOUSE_PASSWORD="" swift test
12+
swift_test: CLICKHOUSE_USER="default" CLICKHOUSE_PASSWORD="" swift test
1313
cache_version: 1
14+
CLICKHOUSE_SERVER: clickhouse
1415
jobs:
1516
macOS:
1617
strategy:
@@ -26,6 +27,9 @@ jobs:
2627
macos: macOS-14
2728
runs-on: ${{ matrix.macos }}
2829
name: macOS
30+
services:
31+
clickhouse:
32+
image: clickhouse/clickhouse-server
2933
steps:
3034
- uses: actions/checkout@master
3135
- name: Select Xcode version
@@ -48,8 +52,6 @@ jobs:
4852
- name: Resolve dependencies
4953
if: steps.cache-resolved-dependencies.outputs.cache-hit != 'true'
5054
run: ${{ env.swift_package_resolve }}
51-
- name: Install clickhouse
52-
run: curl https://clickhouse.com/ | sh && ./clickhouse server
5355
- name: Build
5456
run: ${{ env.swift_build }}
5557
- name: Test
@@ -72,6 +74,9 @@ jobs:
7274
runs-on: ubuntu-20.04
7375
container: ${{ matrix.container }}
7476
name: Linux
77+
services:
78+
clickhouse:
79+
image: clickhouse/clickhouse-server
7580
steps:
7681
- name: Get Swift Version
7782
id: get-swift-version
@@ -89,13 +94,6 @@ jobs:
8994
key: ${{ matrix.cache-version }}-${{ runner.os }}-${{ steps.get-swift-version.outputs.version }}-${{ env.cache_version }}-spm-deps-${{ hashFiles('Package.swift', 'Package.resolved') }}
9095
restore-keys: |
9196
${{ matrix.cache-version }}-${{ runner.os }}-${{ steps.get-swift-version.outputs.version }}-${{ env.cache_version }}-spm-deps-
92-
- name: Install clickhouse
93-
run: |
94-
apt-get update; DEBIAN_FRONTEND=noninteractive apt-get install -qq -y apt-transport-https ca-certificates curl gnupg
95-
curl -fsSL 'https://packages.clickhouse.com/rpm/lts/repodata/repomd.xml.key' | gpg --dearmor -o /usr/share/keyrings/clickhouse-keyring.gpg
96-
echo "deb [signed-by=/usr/share/keyrings/clickhouse-keyring.gpg] https://packages.clickhouse.com/deb stable main" | tee /etc/apt/sources.list.d/clickhouse.list
97-
apt-get update; DEBIAN_FRONTEND=noninteractive apt-get install -qq -y clickhouse-server
98-
service clickhouse-server start
9997
- name: Resolve dependencies
10098
if: steps.cache-resolved-dependencies.outputs.cache-hit != 'true'
10199
run: ${{ env.swift_package_resolve }}

0 commit comments

Comments
 (0)