From f5aa946cc7b97bdcff29a61b02f15142e4d38294 Mon Sep 17 00:00:00 2001
From: Carlo Piovesan <piovesan.carlo@gmail.com>
Date: Mon, 12 Feb 2024 21:04:30 +0100
Subject: [PATCH 1/3] Bump duckdb, fix Makefile and workflow

---
 .github/workflows/MainDistributionPipeline.yml | 8 +++++---
 Makefile                                       | 4 ++--
 duckdb                                         | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
index 19e81d9..c1243dd 100644
--- a/.github/workflows/MainDistributionPipeline.yml
+++ b/.github/workflows/MainDistributionPipeline.yml
@@ -14,11 +14,12 @@ concurrency:
 jobs:
   duckdb-stable-build:
     name: Build extension binaries
-    uses: duckdb/duckdb/.github/workflows/_extension_distribution.yml@6812703823d1d66566bc7eaac2b6e4b273c85333
+    uses: duckdb/duckdb/.github/workflows/_extension_distribution.yml@0e784765f6f87bd1ce9034afcce1e7f89fcd8777
     with:
       vcpkg_commit: a42af01b72c28a8e1d7b48107b33e4f286a55ef6
-      duckdb_version: v0.9.2
+      duckdb_version: 0e784765f6
       extension_name: quack
+      exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads'
 
   duckdb-stable-deploy:
     name: Deploy extension binaries
@@ -26,7 +27,8 @@ jobs:
     uses: ./.github/workflows/_extension_deploy.yml
     secrets: inherit
     with:
-      duckdb_version: v0.9.2
+      duckdb_version: 0e784765f6
       extension_name: quack
+      exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads'
       deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
       deploy_versioned: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
diff --git a/Makefile b/Makefile
index 637f634..5e82f76 100644
--- a/Makefile
+++ b/Makefile
@@ -43,9 +43,9 @@ EXTENSION_FLAGS=\
 -DDUCKDB_EXTENSION_${EXTENSION_NAME}_TEST_PATH="$(PROJ_DIR)test/sql"
 
 #### Add more of the DuckDB in-tree extensions here that you need (also feel free to remove them when not needed)
-EXTRA_EXTENSIONS_FLAG=-DBUILD_EXTENSIONS="tpch;visualizer"
+EXTRA_EXTENSIONS_FLAG=-DBUILD_EXTENSIONS="tpch"
 
-BUILD_FLAGS=-DEXTENSION_STATIC_BUILD=1 $(EXTENSION_FLAGS) ${EXTRA_EXTENSIONS_FLAG} $(OSX_BUILD_FLAG) $(TOOLCHAIN_FLAGS)
+BUILD_FLAGS=-DEXTENSION_STATIC_BUILD=1 $(EXTENSION_FLAGS) ${EXTRA_EXTENSIONS_FLAG} $(OSX_BUILD_FLAG) $(TOOLCHAIN_FLAGS) -DDUCKDB_EXPLICIT_PLATFORM='${DUCKDB_PLATFORM}'
 CLIENT_FLAGS:=
 
 #### Main build
diff --git a/duckdb b/duckdb
index 3c695d7..0e78476 160000
--- a/duckdb
+++ b/duckdb
@@ -1 +1 @@
-Subproject commit 3c695d7ba94d95d9facee48d395f46ed0bd72b46
+Subproject commit 0e784765f6f87bd1ce9034afcce1e7f89fcd8777

From eaf9024b5eb109ac9c81b3aef0b71501e1784cbe Mon Sep 17 00:00:00 2001
From: Carlo Piovesan <piovesan.carlo@gmail.com>
Date: Tue, 13 Feb 2024 14:45:40 +0100
Subject: [PATCH 2/3] Update Makefile for window-r builds

---
 Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 5e82f76..1553462 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,15 @@ all: release
 MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
 PROJ_DIR := $(dir $(MKFILE_PATH))
 
+TEST_PATH="/test/unittest"
+DUCKDB_PATH="/duckdb"
+
+# For non-MinGW windows the path is slightly different
 ifeq ($(OS),Windows_NT)
+ifneq ($(CXX),g++)
 	TEST_PATH="/test/Release/unittest.exe"
-else
-	TEST_PATH="/test/unittest"
+	DUCKDB_PATH="/Release/duckdb.exe"
+endif
 endif
 
 #### OSX config

From 1d4e798adaca2b416365f85ff3ec1ab3f22154f3 Mon Sep 17 00:00:00 2001
From: Carlo Piovesan <piovesan.carlo@gmail.com>
Date: Tue, 13 Feb 2024 14:46:27 +0100
Subject: [PATCH 3/3] Bump duckdb to v0.10.0

---
 .github/workflows/MainDistributionPipeline.yml | 6 +++---
 duckdb                                         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
index c1243dd..055d783 100644
--- a/.github/workflows/MainDistributionPipeline.yml
+++ b/.github/workflows/MainDistributionPipeline.yml
@@ -14,10 +14,10 @@ concurrency:
 jobs:
   duckdb-stable-build:
     name: Build extension binaries
-    uses: duckdb/duckdb/.github/workflows/_extension_distribution.yml@0e784765f6f87bd1ce9034afcce1e7f89fcd8777
+    uses: duckdb/duckdb/.github/workflows/_extension_distribution.yml@v0.10.0
     with:
       vcpkg_commit: a42af01b72c28a8e1d7b48107b33e4f286a55ef6
-      duckdb_version: 0e784765f6
+      duckdb_version: v0.10.0
       extension_name: quack
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads'
 
@@ -27,7 +27,7 @@ jobs:
     uses: ./.github/workflows/_extension_deploy.yml
     secrets: inherit
     with:
-      duckdb_version: 0e784765f6
+      duckdb_version: v0.10.0
       extension_name: quack
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads'
       deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
diff --git a/duckdb b/duckdb
index 0e78476..20b1486 160000
--- a/duckdb
+++ b/duckdb
@@ -1 +1 @@
-Subproject commit 0e784765f6f87bd1ce9034afcce1e7f89fcd8777
+Subproject commit 20b1486d1192f9fbd2328d1122b5afe5f1747fce