Skip to content

Commit 7af762e

Browse files
committed
Prepare Spark resources in a separate dir
1 parent 1b6c298 commit 7af762e

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

.github/workflows/Java.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ jobs:
3434
MANYLINUX_IMAGE: quay.io/pypa/manylinux_2_28_x86_64
3535
# Spark testing env vars below
3636
DUCKDB_JDBC_JAR: ${{ github.workspace }}/build/release/duckdb_jdbc.jar
37-
SPARK_SQL_EXE: ${{ github.workspace }}/spark-3.5.3-bin-hadoop3/bin/spark-sql
37+
SPARK_SQL_EXE: ${{ github.workspace }}/sparktest/spark-3.5.3-bin-hadoop3/bin/spark-sql
3838
POSTGRES_HOST: 127.0.0.1
3939
POSTGRES_PORT: 5432
4040
POSTGRES_MAINTENANCE_DB: postgres
4141
POSTGRES_USERNAME: postgres
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/sparktest/spark-session-init.sql
46-
MINIO_EXE: ${{ github.workspace }}/minio
47-
MINIO_PID: ${{ github.workspace }}/minio.pid
48-
MC_EXE: ${{ github.workspace }}/mc
49-
MINIO_DATA: ${{ github.workspace }}/minio_data
45+
SESSION_INIT_SQL_FILE: ${{ github.workspace }}/sparktest/spark-session-init.sql
46+
MINIO_EXE: ${{ github.workspace }}/sparktest/minio
47+
MINIO_PID: ${{ github.workspace }}/sparktest/minio.pid
48+
MC_EXE: ${{ github.workspace }}/sparktest/mc
49+
MINIO_DATA: ${{ github.workspace }}/sparktest/minio_data
5050
MINIO_HOST: 127.0.0.1
5151
MINIO_PORT: 9000
5252
steps:
@@ -134,10 +134,9 @@ jobs:
134134
135135
- name: Spark Test Resources
136136
run: |
137-
cd build
138137
mkdir sparktest
139138
cd sparktest
140-
cmake ../..
139+
cmake ..
141140
142141
- name: Setup Postgres
143142
uses: ikalnytskyi/action-setup-postgres@v7
@@ -150,6 +149,7 @@ jobs:
150149
ssl: true
151150

152151
- name: Setup Minio
152+
working-directory: sparktest
153153
run: |
154154
wget -nv https://dl.min.io/server/minio/release/linux-amd64/minio
155155
chmod +x minio
@@ -158,22 +158,24 @@ jobs:
158158
chmod +x mc
159159
./mc --version
160160
java -version
161-
java ./src/test/external/SetupMinio.java
161+
java ${{ github.workspace }}/src/test/external/SetupMinio.java
162162
163163
- name: Setup DuckLake
164+
working-directory: sparktest
164165
run: |
165166
cat ${{ env.SESSION_INIT_SQL_FILE }}
166167
wget -nv https://github.com/pgjdbc/pgjdbc/releases/download/REL42.7.7/postgresql-42.7.7.jar
167168
java -version
168-
java -cp ${{ env.DUCKDB_JDBC_JAR }}:postgresql-42.7.7.jar ./src/test/external/SetupDuckLake.java
169+
java -cp ${{ env.DUCKDB_JDBC_JAR }}:postgresql-42.7.7.jar ${{ github.workspace }}/src/test/external/SetupDuckLake.java
169170
170171
- name: Spark Tests
172+
working-directory: sparktest
171173
run: |
172174
wget -nv https://blobs.duckdb.org/ci/spark-3.5.3-bin-hadoop3.tgz
173175
tar xf spark-3.5.3-bin-hadoop3.tgz
174-
cat ./build/sparktest/spark-test.sql
176+
cat spark-test.sql
175177
java -version
176-
java ./src/test/external/RunSpark.java ./build/sparktest/spark-test.sql
178+
java ${{ github.workspace }}/src/test/external/RunSpark.java spark-test.sql
177179
178180
- name: Deploy
179181
shell: bash

0 commit comments

Comments
 (0)