switch to duckdb/duckdb

duckdb · Nov 7, 2024 · fa01f21 · fa01f21
1 parent 34c045e
commit fa01f21
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
@@ -14,11 +14,10 @@ concurrency:
 jobs:
   duckdb-stable-build:
     name: Build extension binaries
-    uses: samansmink/extension-ci-tools/.github/workflows/_extension_distribution.yml@minor-scipt-additions
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
       duckdb_version: v1.1.3
-      ci_tools_version: minor-scipt-additions
-      override_ci_tools_repository: samansmink/extension-ci-tools
+      ci_tools_version: main
       extension_name: rusty_quack
       extra_toolchains: rust;python3
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
diff --git a/Makefile b/Makefile
@@ -2,7 +2,6 @@
 
 PROJ_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
-# TODO: these values are currently duplicated in lib.rs. Fetching them from the env variables in the proc macro should fix this
 EXTENSION_NAME=rusty_quack
 MINIMUM_DUCKDB_VERSION=v0.0.1
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -85,8 +85,8 @@ impl VTab for HelloVTab {
     }
 }
 
-#[duckdb_entrypoint_c_api(ext_name = "rusty_quack", min_duckdb_version = "v0.0.1")]
-pub unsafe fn ExtensionEntrypoint(con: Connection) -> Result<(), Box<dyn Error>> {
+#[duckdb_entrypoint_c_api()]
+pub unsafe fn extension_entrypoint(con: Connection) -> Result<(), Box<dyn Error>> {
     con.register_table_function::<HelloVTab>("rusty_quack")
         .expect("Failed to register hello table function");
     Ok(())