From 9a9d034433791e981783689196deae899410a7f8 Mon Sep 17 00:00:00 2001 From: Sam Ansmink Date: Thu, 25 Apr 2024 13:12:44 +0200 Subject: [PATCH 1/6] bump to v0.10.2 --- .github/workflows/MainDistributionPipeline.yml | 6 +++--- duckdb | 2 +- extension-ci-tools | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml index de5e5deb..717c029d 100644 --- a/.github/workflows/MainDistributionPipeline.yml +++ b/.github/workflows/MainDistributionPipeline.yml @@ -14,9 +14,9 @@ concurrency: jobs: duckdb-stable-build: name: Build extension binaries - uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v0.10.1 + uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v0.10.2 with: - duckdb_version: v0.10.1 + duckdb_version: v0.10.2 extension_name: quack duckdb-stable-deploy: @@ -25,6 +25,6 @@ jobs: uses: ./.github/workflows/_extension_deploy.yml secrets: inherit with: - duckdb_version: v0.10.1 + duckdb_version: v0.10.2 extension_name: quack deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }} diff --git a/duckdb b/duckdb index 4a89d97d..1601d94f 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit 4a89d97db8a5a23a15f3025c8d2d2885337c2637 +Subproject commit 1601d94f94a7e0d2eb805a94803eb1e3afbbe4ed diff --git a/extension-ci-tools b/extension-ci-tools index 278ca510..54facfe2 160000 --- a/extension-ci-tools +++ b/extension-ci-tools @@ -1 +1 @@ -Subproject commit 278ca51098ac492a3108915e72fe3076254ae80f +Subproject commit 54facfe2ceb9a6c3e7e12954490652a41837c2d8 From 79280254e73d46bf9a9275165f390553d73ec890 Mon Sep 17 00:00:00 2001 From: Sam Ansmink Date: Thu, 25 Apr 2024 13:14:49 +0200 Subject: [PATCH 2/6] bump python to 3.11 --- .github/workflows/ExtensionTemplate.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ExtensionTemplate.yml b/.github/workflows/ExtensionTemplate.yml index 127e8e3c..43a162a3 100644 --- a/.github/workflows/ExtensionTemplate.yml +++ b/.github/workflows/ExtensionTemplate.yml @@ -102,7 +102,7 @@ jobs: - uses: actions/setup-python@v2 with: - python-version: '3.7' + python-version: '3.11' - name: Checkout DuckDB to version if: ${{ matrix.duckdb_version != ''}} @@ -150,7 +150,7 @@ jobs: - uses: actions/setup-python@v2 with: - python-version: '3.7' + python-version: '3.11' - name: Checkout DuckDB to version # Add commits/tags to build against other DuckDB versions From c0f5a22640ae94a678a45ef9feafc282d7824746 Mon Sep 17 00:00:00 2001 From: Pedro Holanda Date: Thu, 25 Apr 2024 14:22:25 +0200 Subject: [PATCH 3/6] Secrets are mismatched with readme --- .github/workflows/_extension_deploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/_extension_deploy.yml b/.github/workflows/_extension_deploy.yml index 12dde36f..c408f906 100644 --- a/.github/workflows/_extension_deploy.yml +++ b/.github/workflows/_extension_deploy.yml @@ -101,10 +101,10 @@ jobs: - name: Deploy shell: bash env: - AWS_ACCESS_KEY_ID: ${{ secrets.S3_DUCKDB_ORG_DEPLOY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_DUCKDB_ORG_DEPLOY_KEY }} - AWS_DEFAULT_REGION: ${{ secrets.S3_DUCKDB_ORG_REGION }} - BUCKET_NAME: ${{ secrets.S3_DUCKDB_ORG_BUCKET }} + AWS_ACCESS_KEY_ID: ${{ secrets.S3_DEPLOY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_DEPLOY_KEY }} + AWS_DEFAULT_REGION: ${{ secrets.S3_REGION }} + BUCKET_NAME: ${{ secrets.S3_BUCKET }} DUCKDB_EXTENSION_SIGNING_PK: ${{ secrets.S3_DUCKDB_ORG_EXTENSION_SIGNING_PK }} run: | pwd From d2d797812438800a7ecf9fb8e524f4823b8656c8 Mon Sep 17 00:00:00 2001 From: Carlo Piovesan Date: Thu, 25 Apr 2024 16:05:42 +0200 Subject: [PATCH 4/6] CMake: bump version to 3.5 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5886a88..1d144aa6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) # Set extension name here set(TARGET_NAME quack) From 12d8e71e108b96691fac225e538e0efa88173618 Mon Sep 17 00:00:00 2001 From: Carlo Piovesan Date: Tue, 21 May 2024 11:47:15 +0200 Subject: [PATCH 5/6] Add version information --- src/include/quack_extension.hpp | 1 + src/quack_extension.cpp | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/src/include/quack_extension.hpp b/src/include/quack_extension.hpp index ac9f5049..494467b7 100644 --- a/src/include/quack_extension.hpp +++ b/src/include/quack_extension.hpp @@ -8,6 +8,7 @@ class QuackExtension : public Extension { public: void Load(DuckDB &db) override; std::string Name() override; + std::string Version() const override; }; } // namespace duckdb diff --git a/src/quack_extension.cpp b/src/quack_extension.cpp index 4fdad780..468b2e2b 100644 --- a/src/quack_extension.cpp +++ b/src/quack_extension.cpp @@ -51,6 +51,14 @@ std::string QuackExtension::Name() { return "quack"; } +std::string QuackExtension::Version() const { +#ifdef EXT_VERSION_QUACK + return EXT_VERSION_QUACK; +#else + return ""; +#endif +} + } // namespace duckdb extern "C" { From 883e04aad6870b91c9c8cc238010f401eaa51cf9 Mon Sep 17 00:00:00 2001 From: Carlo Piovesan Date: Wed, 22 May 2024 16:18:21 +0200 Subject: [PATCH 6/6] Move to duckdb v0.10.3 and extension-ci-tools v0.10.3 --- .github/workflows/MainDistributionPipeline.yml | 6 +++--- duckdb | 2 +- extension-ci-tools | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml index 717c029d..38493392 100644 --- a/.github/workflows/MainDistributionPipeline.yml +++ b/.github/workflows/MainDistributionPipeline.yml @@ -14,9 +14,9 @@ concurrency: jobs: duckdb-stable-build: name: Build extension binaries - uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v0.10.2 + uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v0.10.3 with: - duckdb_version: v0.10.2 + duckdb_version: v0.10.3 extension_name: quack duckdb-stable-deploy: @@ -25,6 +25,6 @@ jobs: uses: ./.github/workflows/_extension_deploy.yml secrets: inherit with: - duckdb_version: v0.10.2 + duckdb_version: v0.10.3 extension_name: quack deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }} diff --git a/duckdb b/duckdb index 1601d94f..70fd6a8a 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit 1601d94f94a7e0d2eb805a94803eb1e3afbbe4ed +Subproject commit 70fd6a8a2450c1e2a7d0547d4c0666a649dc378e diff --git a/extension-ci-tools b/extension-ci-tools index 54facfe2..71b8a603 160000 --- a/extension-ci-tools +++ b/extension-ci-tools @@ -1 +1 @@ -Subproject commit 54facfe2ceb9a6c3e7e12954490652a41837c2d8 +Subproject commit 71b8a603ea24b1ac8a2cff134aca28163576548f