Merge pull request #36 from samansmink/update-to-new-workflow

Update DuckDB

.github/workflows/ClientTests.yml

@@ -13,6 +13,6 @@ concurrency:
 jobs:
   client-tests:
     name: Client Tests
-    uses: duckdb/duckdb/.github/workflows/_extension_client_tests.yml@26931f7ac687e8323c24e7f7b1e081114400d1b3
+    uses: duckdb/duckdb/.github/workflows/_extension_client_tests.yml@0d84ccf478578278b2d1168675b8b93c60f78a5e
     with:
-      duckdb_version: 26931f7ac6
+      duckdb_version: 0d84ccf478

.github/workflows/ExtensionTemplate.yml

@@ -2,7 +2,6 @@
 # NOTE: this workflow is for testing the extension template itself,
 #     this workflow will be removed when scripts/set_extension_name.py is run
 #
-
 name: Extension Template
 on: [push, pull_request,repository_dispatch]
 concurrency:
@@ -11,7 +10,7 @@ concurrency:
 
 jobs:
   linux:
-    name: Linux Extensions
+    name: Linux
     if: ${{ vars.RUN_RENAME_TEST == 'true' }}
     runs-on: ubuntu-latest
     container: ubuntu:18.04
@@ -20,6 +19,8 @@ jobs:
         # Add commits/tags to build against other DuckDB versions
         duckdb_version: [ '<submodule_version>' ]
     env:
+      VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
+      VCPKG_TARGET_TRIPLET: 'x64-linux'
       GEN: ninja
     defaults:
       run:
@@ -56,6 +57,11 @@ jobs:
 
       - uses: ./duckdb/.github/actions/ubuntu_18_setup
 
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v11
+        with:
+          vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1
+
       - name: Rename extension
         run: |
           python3 scripts/set_extension_name.py testext testext
@@ -77,7 +83,9 @@ jobs:
         # Add commits/tags to build against other DuckDB versions
         duckdb_version: [ '<submodule_version>']
     env:
-      OSX_BUILD_UNIVERSAL: 1
+      VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
+      VCPKG_TARGET_TRIPLET: 'x64-osx'
+      OSX_BUILD_ARCH: 'x86_64'
       GEN: ninja
     defaults:
       run:
@@ -102,6 +110,11 @@ jobs:
           cd duckdb
           git checkout ${{ matrix.duckdb_version }}
 
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v11
+        with:
+          vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1
+
       - name: Rename extension
         run: |
           python scripts/set_extension_name.py testext testext
@@ -115,13 +128,16 @@ jobs:
           make test
 
   windows:
-    name: Windows Extensions (x64)
+    name: Windows
     if: ${{ vars.RUN_RENAME_TEST == 'true' }}
     runs-on: windows-latest
     strategy:
       matrix:
         # Add commits/tags to build against other DuckDB versions
         duckdb_version: [ '<submodule_version>' ]
+    env:
+      VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
+      VCPKG_TARGET_TRIPLET: 'x64-windows-static-md'
     defaults:
       run:
         shell: bash
@@ -143,6 +159,11 @@ jobs:
           cd duckdb
           git checkout ${{ matrix.duckdb_version }}
 
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v11
+        with:
+          vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1
+
       - name: Rename extension
         run: |
           python scripts/set_extension_name.py testext testext
@@ -151,6 +172,6 @@ jobs:
         run: |
           make
 
-      - name: Build extension
+      - name: Test extension
         run: |
           build/release/test/Release/unittest.exe

.github/workflows/MainDistributionPipeline.yml

@@ -14,11 +14,11 @@ concurrency:
 jobs:
   duckdb-main-pipeline:
     name: DuckDB Main Pipeline
-    uses: duckdb/duckdb/.github/workflows/_extension_distribution.yml@26931f7ac687e8323c24e7f7b1e081114400d1b3
+    uses: duckdb/duckdb/.github/workflows/_extension_distribution.yml@0d84ccf478578278b2d1168675b8b93c60f78a5e
     with:
-      duckdb_version: 26931f7ac6
+      duckdb_version: 0d84ccf478
       extension_name: quack
-      extension_ref: ${{ github.ref_name }}
+      extension_ref: ${{ github.ref }}
     # Secrets are used to pass S3 credentials to the extension-upload script for distributing.
     # Note that for security, switching to either explicitly passing secrets or moving the workflow into the extension
     # repository can be considered.

Makefile

@@ -87,12 +87,12 @@ test_js: test_debug_js
 test_debug_js: debug_js
 	cd duckdb/tools/nodejs && ${EXTENSION_NAME}_EXTENSION_BINARY_PATH=$(DEBUG_EXT_PATH) npm run test-path -- "../../../test/nodejs/**/*.js"
 test_release_js: release_js
-	cd duckdb/tools/nodejs && ${EXTENSION_NAME}_EXTENSION_BINARY_PATH=$(DEBUG_EXT_PATH) npm run test-path -- "../../../test/nodejs/**/*.js"
+	cd duckdb/tools/nodejs && ${EXTENSION_NAME}_EXTENSION_BINARY_PATH=$(RELEASE_EXT_PATH) npm run test-path -- "../../../test/nodejs/**/*.js"
 test_python: test_debug_python
 test_debug_python: debug_python
 	cd test/python && ${EXTENSION_NAME}_EXTENSION_BINARY_PATH=$(DEBUG_EXT_PATH) python3 -m pytest
 test_release_python: release_python
-	cd test/python && ${EXTENSION_NAME}_EXTENSION_BINARY_PATH=$(DEBUG_EXT_PATH) python3 -m pytest
+	cd test/python && ${EXTENSION_NAME}_EXTENSION_BINARY_PATH=$(RELEASE_EXT_PATH) python3 -m pytest
 
 #### Misc
 format: