Bump duckdb version to next minor and remove custom patch

dacort · Feb 13, 2024 · 43e79a8 · 43e79a8
1 parent 78511d4
commit 43e79a8
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 143 deletions.
diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml
@@ -100,15 +100,8 @@ jobs:
       run: |
         cd duckdb
         git checkout ${{ matrix.duckdb_version }}
-        cd duckdb-ext/duckdb
-        git checkout ${{ matrix.duckdb_version }}
-
-    - name: Patch DuckDB with named parameter support
-      run: |
-        cd duckdb
-        git apply ../duckdb-namedparams.patch
         cd ../duckdb-ext/duckdb
-        git apply ../../duckdb-namedparams.patch
+        git checkout ${{ matrix.duckdb_version }}
 
     - if: ${{ matrix.arch == 'linux_amd64_gcc4' }}
       uses: ./duckdb/.github/actions/centos_7_setup

diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml
@@ -40,13 +40,6 @@ jobs:
           cd ../duckdb-ext/duckdb
           git checkout ${{ matrix.duckdb_version }}
 
-      - name: Patch DuckDB with named parameter support
-        run: |
-          cd duckdb
-          git apply ../duckdb-namedparams.patch
-          cd ../duckdb-ext/duckdb
-          git apply ../../duckdb-namedparams.patch
-
       - name: Build extension
         run: |
           dir duckdb-ext/duckdb/src/include

diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml
@@ -42,15 +42,8 @@ jobs:
         run: |
           cd duckdb
           git checkout ${{ matrix.duckdb_version }}
-          cd duckdb-ext/duckdb
-          git checkout ${{ matrix.duckdb_version }}
-
-      - name: Patch DuckDB with named parameter support
-        run: |
-          cd duckdb
-          git apply ../duckdb-namedparams.patch
           cd ../duckdb-ext/duckdb
-          git apply ../../duckdb-namedparams.patch
+          git checkout ${{ matrix.duckdb_version }}
 
          # Build extension
       - name: Build extension

diff --git a/duckdb b/duckdb
diff --git a/duckdb-ext/duckdb b/duckdb-ext/duckdb
diff --git a/duckdb-namedparams.patch b/duckdb-namedparams.patch