diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml index 90c1927..8b5e44d 100644 --- a/.github/workflows/MainDistributionPipeline.yml +++ b/.github/workflows/MainDistributionPipeline.yml @@ -14,22 +14,22 @@ concurrency: jobs: duckdb-stable-build: name: Build extension binaries - uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main + uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.5-variegata with: - duckdb_version: v1.5-variegata + duckdb_version: v1.5.0 extension_name: sqlite_scanner - ci_tools_version: main + ci_tools_version: v1.5-variegata opt_in_archs: 'linux_amd64_musl;linux_arm64_musl;windows_arm64' duckdb-stable-deploy: name: Deploy extension binaries needs: duckdb-stable-build - uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main + uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.5-variegata secrets: inherit with: - duckdb_version: v1.5-variegata + duckdb_version: v1.5.0 extension_name: sqlite_scanner - ci_tools_version: main + ci_tools_version: v1.5-variegata opt_in_archs: 'linux_amd64_musl;linux_arm64_musl;windows_arm64' 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 fc85aba..a082a1b 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ include extension-ci-tools/makefiles/duckdb_extension.Makefile # Setup the sqlite3 tpch database -data/db/tpch.db: release +data/db/tpch.db: command -v sqlite3 || (command -v brew && brew install sqlite) || (command -v choco && choco install sqlite -y) || (command -v apt-get && apt-get install -y sqlite3) || (command -v yum && yum install -y sqlite) || (command -v apk && apk add sqlite) || echo "no sqlite3" ./build/release/$(DUCKDB_PATH) < data/sql/tpch-export.duckdb || tree ./build/release || echo "neither tree not duck" sqlite3 data/db/tpch.db < data/sql/tpch-create.sqlite diff --git a/duckdb b/duckdb index f480e78..3a3967a 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit f480e781694b03105c9281d2564f08adb9a8d4a8 +Subproject commit 3a3967aa8190d0a2d1931d4ca4f5d920760030b4 diff --git a/extension-ci-tools b/extension-ci-tools index fccd748..de54d6c 160000 --- a/extension-ci-tools +++ b/extension-ci-tools @@ -1 +1 @@ -Subproject commit fccd748f513d018a6cb2b6e4223cec85aaa280fc +Subproject commit de54d6cef550b4b54cc3e817eeb8c4415faf6c35