From 092fec5d43b97d361a0ac883bc97365552448eb1 Mon Sep 17 00:00:00 2001 From: Sam Ansmink Date: Sun, 13 Oct 2024 13:49:32 +0200 Subject: [PATCH] add python3 extra toolchain --- .github/workflows/MainDistributionPipeline.yml | 2 +- Makefile | 11 ++++++++++- extension-ci-tools | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml index 72abfcc..34f98ab 100644 --- a/.github/workflows/MainDistributionPipeline.yml +++ b/.github/workflows/MainDistributionPipeline.yml @@ -27,7 +27,7 @@ jobs: duckdb_version: v1.1.1 ci_tools_version: main extension_name: rusty_quack - extra_toolchains: rust + extra_toolchains: rust;python3 matrix_parse_script: "./extension-ci-tools/scripts/modify_distribution_matrix.py" exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64' diff --git a/Makefile b/Makefile index 69bd21c..6a3a0c2 100644 --- a/Makefile +++ b/Makefile @@ -18,8 +18,17 @@ ifneq ($(EXPLICIT_EXTENSION_VERSION),) EXTENSION_VERSION = $(EXPLICIT_EXTENSION_VERSION) endif -# TODO make platform independent EXTENSION_LIB_FILENAME=lib$(EXTENSION_NAME).dylib +ifeq ($(UNAME_S),Linux) + EXTENSION_LIB_FILENAME=lib$(EXTENSION_NAME).so +endif +ifeq ($(UNAME_S),Darwin) + EXTENSION_LIB_FILENAME=lib$(EXTENSION_NAME).dylib +endif +ifeq ($(OS),Windows_NT) + # TODO: how/what/where + EXTENSION_LIB_FILENAME=lib$(EXTENSION_NAME).dylib +endif EXTENSION_FILENAME=$(EXTENSION_NAME).duckdb_extension ### Development options diff --git a/extension-ci-tools b/extension-ci-tools index c1abe75..67be651 160000 --- a/extension-ci-tools +++ b/extension-ci-tools @@ -1 +1 @@ -Subproject commit c1abe752e665114465160e6a3704e46c2037d0b8 +Subproject commit 67be651b7eb6db235184c96cc09904951b2b863d