Merge pull request #312 from carlopi/fix_cmake

Mytherin · web-flow · commit 98482ce5c144 · 2025-04-03T16:56:38.000+02:00
Widen range of cmake_minimum_required
diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
@@ -16,7 +16,7 @@ jobs:
     name: Build extension binaries
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
-      duckdb_version: main
+      duckdb_version: v1.2.1
       ci_tools_version: main
       extension_name: postgres_scanner
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_mingw'
@@ -27,7 +27,7 @@ jobs:
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
     secrets: inherit
     with:
-      duckdb_version: main
+      duckdb_version: v1.2.1
       ci_tools_version: main
       extension_name: postgres_scanner
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_mingw'
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 2.8.12...3.29)
 set(TARGET_NAME postgres_scanner)
 project(${TARGET_NAME})
 
diff --git a/duckdb b/duckdb
@@ -1 +1 @@
-Subproject commit c8fa9aee7858909c625b5c3abcc3a257c5d9d934
+Subproject commit 8e52ec43959ab363643d63cb78ee214577111da4
diff --git a/extension-ci-tools b/extension-ci-tools
@@ -1 +1 @@
-Subproject commit f473553168fd1db490aaa9f440b8f812af0568da
+Subproject commit 00e6af068429bf776a54f67cb1cd1ff5370a8dd7

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-cmake_minimum_required(VERSION 2.8.12)`
	`1`	`+cmake_minimum_required(VERSION 2.8.12...3.29)`
`2`	`2`	`set(TARGET_NAME postgres_scanner)`
`3`	`3`	`project(${TARGET_NAME})`
`4`	`4`