From 6affab1719cad7434678f4915214d68706836900 Mon Sep 17 00:00:00 2001 From: Sam Ansmink Date: Tue, 13 Feb 2024 11:57:07 +0100 Subject: [PATCH 1/5] bump duckdb --- .github/workflows/MainDistributionPipeline.yml | 8 ++++---- duckdb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml index b6b86f3..2063d32 100644 --- a/.github/workflows/MainDistributionPipeline.yml +++ b/.github/workflows/MainDistributionPipeline.yml @@ -14,20 +14,20 @@ concurrency: jobs: duckdb-stable-build: name: Build extension binaries - uses: duckdb/duckdb/.github/workflows/_extension_distribution.yml@1e216074028c0aaef838ae2075e2e30705aa48e7 + uses: duckdb/duckdb/.github/workflows/_extension_distribution.yml@4d24f5c660a205bf22a7fd99e36efece798452c4 with: extension_name: aws - duckdb_version: '1e21607402' + duckdb_version: '4d24f5c660' exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads' # Doesn't work anyway: env local file or env access possible duckdb-stable-deploy: name: Deploy extension binaries needs: duckdb-stable-build - uses: duckdb/duckdb/.github/workflows/_extension_deploy.yml@1e216074028c0aaef838ae2075e2e30705aa48e7 + uses: duckdb/duckdb/.github/workflows/_extension_deploy.yml@4d24f5c660a205bf22a7fd99e36efece798452c4 secrets: inherit with: extension_name: aws - duckdb_version: '1e21607402' + duckdb_version: '4d24f5c660' exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads' # Doesn't work anyway: env local file or env access possible 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/duckdb b/duckdb index 1e21607..4d24f5c 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit 1e216074028c0aaef838ae2075e2e30705aa48e7 +Subproject commit 4d24f5c660a205bf22a7fd99e36efece798452c4 From 7df053e4fe5ef6872b76322ae2479ebbf53479ec Mon Sep 17 00:00:00 2001 From: Sam Ansmink Date: Tue, 13 Feb 2024 12:09:22 +0100 Subject: [PATCH 2/5] disable rtools --- .github/workflows/MainDistributionPipeline.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml index 2063d32..b004952 100644 --- a/.github/workflows/MainDistributionPipeline.yml +++ b/.github/workflows/MainDistributionPipeline.yml @@ -18,7 +18,7 @@ jobs: with: extension_name: aws duckdb_version: '4d24f5c660' - exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads' # Doesn't work anyway: env local file or env access possible + exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools' # Doesn't work anyway: env local file or env access possible duckdb-stable-deploy: name: Deploy extension binaries @@ -28,6 +28,6 @@ jobs: with: extension_name: aws duckdb_version: '4d24f5c660' - exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads' # Doesn't work anyway: env local file or env access possible + exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools' # Doesn't work anyway: env local file or env access possible 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' }} + deploy_versioned: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }} \ No newline at end of file From 0fec0abc77f9b8aab3f4a6a5aa2da300ee63d3a7 Mon Sep 17 00:00:00 2001 From: Sam Ansmink Date: Tue, 13 Feb 2024 12:36:43 +0100 Subject: [PATCH 3/5] add explicit platform --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6198358..61bbd5a 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ ifeq ($(GEN),ninja) FORCE_COLOR=-DFORCE_COLORED_OUTPUT=1 endif -BUILD_FLAGS=-DBUILD_EXTENSIONS="tpch;httpfs" ${STATIC_LINK_DUCKDB_FLAG} ${OSX_BUILD_UNIVERSAL_FLAG} ${STATIC_LIBCPP} ${DISABLE_UNITY_FLAG} ${TOOLCHAIN_FLAGS} +BUILD_FLAGS=-DBUILD_EXTENSIONS="tpch;httpfs" ${STATIC_LINK_DUCKDB_FLAG} ${OSX_BUILD_UNIVERSAL_FLAG} ${STATIC_LIBCPP} ${DISABLE_UNITY_FLAG} ${TOOLCHAIN_FLAGS} -DDUCKDB_EXPLICIT_PLATFORM='${DUCKDB_PLATFORM}' CLIENT_FLAGS := From 7b2bcca352b71150984a99a61be7f16d55f2ba7f Mon Sep 17 00:00:00 2001 From: Sam Ansmink Date: Tue, 13 Feb 2024 14:15:29 +0100 Subject: [PATCH 4/5] bump to v0.10.0 --- .github/workflows/MainDistributionPipeline.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml index b004952..1f2d7a2 100644 --- a/.github/workflows/MainDistributionPipeline.yml +++ b/.github/workflows/MainDistributionPipeline.yml @@ -14,20 +14,20 @@ concurrency: jobs: duckdb-stable-build: name: Build extension binaries - uses: duckdb/duckdb/.github/workflows/_extension_distribution.yml@4d24f5c660a205bf22a7fd99e36efece798452c4 + uses: duckdb/duckdb/.github/workflows/_extension_distribution.yml@v0.10.0 with: extension_name: aws - duckdb_version: '4d24f5c660' + duckdb_version: 'v0.10.0' exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools' # Doesn't work anyway: env local file or env access possible duckdb-stable-deploy: name: Deploy extension binaries needs: duckdb-stable-build - uses: duckdb/duckdb/.github/workflows/_extension_deploy.yml@4d24f5c660a205bf22a7fd99e36efece798452c4 + uses: duckdb/duckdb/.github/workflows/_extension_deploy.yml@v0.10.0 secrets: inherit with: extension_name: aws - duckdb_version: '4d24f5c660' + duckdb_version: 'v0.10.0' exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools' # Doesn't work anyway: env local file or env access possible 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' }} \ No newline at end of file From b2d28a66b0d4e166cd275e6700ac87db971ae518 Mon Sep 17 00:00:00 2001 From: Sam Ansmink Date: Tue, 13 Feb 2024 14:18:41 +0100 Subject: [PATCH 5/5] bump submodule to v0.10.0 --- duckdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/duckdb b/duckdb index 4d24f5c..20b1486 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit 4d24f5c660a205bf22a7fd99e36efece798452c4 +Subproject commit 20b1486d1192f9fbd2328d1122b5afe5f1747fce