Skip to content

Commit 1b6c298

Browse files
committed
Spark test resources fix
1 parent 7a3b27e commit 1b6c298

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

.github/workflows/Java.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
POSTGRES_PASSWORD: postgres
4343
DUCKLAKE_CATALOG_DB: lake_test
4444
PARQUET_FILE_URL: https://blobs.duckdb.org/data/taxi_2019_04.parquet
45-
SESSION_INIT_SQL_FILE: ${{ github.workspace }}/build/release/spark-session-init.sql
45+
SESSION_INIT_SQL_FILE: ${{ github.workspace }}/build/sparktest/spark-session-init.sql
4646
MINIO_EXE: ${{ github.workspace }}/minio
4747
MINIO_PID: ${{ github.workspace }}/minio.pid
4848
MC_EXE: ${{ github.workspace }}/mc
@@ -55,7 +55,6 @@ jobs:
5555
fetch-depth: 0
5656

5757
- name: Build
58-
shell: bash
5958
run: |
6059
docker run \
6160
-v.:/duckdb \
@@ -74,7 +73,6 @@ jobs:
7473
"
7574
7675
- name: JDBC Tests EL8
77-
shell: bash
7876
if: ${{ inputs.skip_tests != 'true' }}
7977
run: |
8078
docker run \
@@ -94,7 +92,6 @@ jobs:
9492
"
9593
9694
- name: JDBC Tests
97-
shell: bash
9895
if: ${{ inputs.skip_tests != 'true' }}
9996
run: |
10097
cat /etc/os-release
@@ -120,7 +117,6 @@ jobs:
120117

121118
- name: CTS tests
122119
if: ${{ inputs.skip_tests != 'true' }}
123-
shell: bash
124120
run: |
125121
docker run \
126122
-v.:/duckdb \
@@ -136,6 +132,13 @@ jobs:
136132
make -C /duckdb/jdbc_compatibility_test_suite_runner test
137133
"
138134
135+
- name: Spark Test Resources
136+
run: |
137+
cd build
138+
mkdir sparktest
139+
cd sparktest
140+
cmake ../..
141+
139142
- name: Setup Postgres
140143
uses: ikalnytskyi/action-setup-postgres@v7
141144
with:
@@ -159,17 +162,18 @@ jobs:
159162
160163
- name: Setup DuckLake
161164
run: |
165+
cat ${{ env.SESSION_INIT_SQL_FILE }}
162166
wget -nv https://github.com/pgjdbc/pgjdbc/releases/download/REL42.7.7/postgresql-42.7.7.jar
163167
java -version
164168
java -cp ${{ env.DUCKDB_JDBC_JAR }}:postgresql-42.7.7.jar ./src/test/external/SetupDuckLake.java
165169
166-
- name: Run Spark Tests
170+
- name: Spark Tests
167171
run: |
168172
wget -nv https://blobs.duckdb.org/ci/spark-3.5.3-bin-hadoop3.tgz
169173
tar xf spark-3.5.3-bin-hadoop3.tgz
170-
cat ./build/release/spark-test.sql
174+
cat ./build/sparktest/spark-test.sql
171175
java -version
172-
java ./src/test/external/RunSpark.java ./build/release/spark-test.sql
176+
java ./src/test/external/RunSpark.java ./build/sparktest/spark-test.sql
173177
174178
- name: Deploy
175179
shell: bash

0 commit comments

Comments
 (0)