Skip to content

Commit e8f3e4b

Browse files
committed
dont use force-local on windows tar, add ccache, add extra exensions
1 parent b524c3d commit e8f3e4b

File tree

3 files changed

+21
-4
lines changed

3 files changed

+21
-4
lines changed

.github/workflows/Linux.yml

+6
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ jobs:
5858
cd duckdb
5959
git checkout ${{ matrix.duckdb_version }}
6060
61+
- name: Setup Ccache
62+
uses: hendrikmuhs/ccache-action@main
63+
with:
64+
key: ${{ github.job }}
65+
save: ${{ github.ref == 'refs/heads/main' || github.repository != 'duckdb/postgres_scanner' }}
66+
6167
- name: Setup vcpkg
6268
uses: lukka/[email protected]
6369
with:

CMakeLists.txt

+11-4
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,17 @@ if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/postgres)
134134

135135
# Extract the PostgreSQL source code
136136
message(STATUS "Extracting PostgreSQL source code")
137-
execute_process(
138-
COMMAND tar -xzf ${CMAKE_CURRENT_SOURCE_DIR}/pg.tar.gz --strip-components 1 --force-local -C postgres
139-
RESULT_VARIABLE PG_EXTRACT_RESULT
140-
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
137+
if(WIN32)
138+
execute_process(
139+
COMMAND tar -xzf ${CMAKE_CURRENT_SOURCE_DIR}/pg.tar.gz --strip-components 1 --force-local -C postgres
140+
RESULT_VARIABLE PG_EXTRACT_RESULT
141+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
142+
else()
143+
execute_process(
144+
COMMAND tar -xzf ${CMAKE_CURRENT_SOURCE_DIR}/pg.tar.gz --strip-components 1 -C postgres
145+
RESULT_VARIABLE PG_EXTRACT_RESULT
146+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
147+
endif()
141148

142149
# Remove the downloaded tarball
143150
file(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/pg.tar.gz)

extension_config.cmake

+4
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,9 @@ duckdb_extension_load(postgres_scanner
77
LOAD_TESTS
88
)
99

10+
duckdb_extension_load(tpch)
11+
duckdb_extension_load(tpcds)
12+
duckdb_extension_load(json)
13+
1014
# Any extra extensions that should be built
1115
# e.g.: duckdb_extension_load(json)

0 commit comments

Comments
 (0)