Merge pull request #9 from dacort/feature/additional-versions

Add additional versions

.github/workflows/Linux.yml

@@ -1,5 +1,5 @@
 name: Linux
-on: [push, pull_request,repository_dispatch]
+on: [push, pull_request]
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ github.ref != 'refs/heads/main' || github.sha }}
   cancel-in-progress: true
@@ -24,7 +24,7 @@ jobs:
         arch: ['linux_amd64', 'linux_arm64'] # , 'linux_amd64_gcc4'
         include:
           - arch: 'linux_amd64'
-            container: 'ubuntu:16.04'
+            container: 'ubuntu:18.04'
           - arch: 'linux_arm64'
             container: 'ubuntu:18.04'
           # - arch: 'linux_amd64_gcc4'
@@ -100,23 +100,16 @@ 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
       with:
         openssl: 0
 
     - if: ${{ matrix.arch == 'linux_amd64' || matrix.arch == 'linux_arm64' }}
-      uses: ./duckdb/.github/actions/ubuntu_16_setup
+      uses: ./duckdb/.github/actions/ubuntu_18_setup
       with:
         aarch64_cross_compile: ${{ matrix.arch == 'linux_arm64' && 1 }}
 

.github/workflows/Windows.yml

@@ -1,5 +1,5 @@
 name: Windows
-on: [push, pull_request,repository_dispatch]
+on: [push, pull_request]
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ github.ref != 'refs/heads/main' || github.sha }}
   cancel-in-progress: true
@@ -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

.github/workflows/macOS.yml

@@ -1,5 +1,5 @@
 name: macOS
-on: [push, pull_request,repository_dispatch]
+on: [push, pull_request]
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ github.ref != 'refs/heads/main' || github.sha }}
   cancel-in-progress: true
@@ -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

scripts/extension-upload.sh

@@ -16,10 +16,12 @@ ext="build/release/extension/duckdb-athena-extension/$1.duckdb_extension"
 gzip < $ext > "$1.duckdb_extension.gz"
 
 # upload compressed extension binary to S3
+echo "Uploading extension binary to s3://$5/artifacts/$1/$2/$3/$4/$1.duckdb_extension.gz"
 aws s3 cp $1.duckdb_extension.gz s3://$5/artifacts/$1/$2/$3/$4/$1.duckdb_extension.gz
 
 if [ $6 = 'true' ]
 then
+  echo "Also copying to latest"
   aws s3 cp $1.duckdb_extension.gz s3://$5/artifacts/$1/latest/$3/$4/$1.duckdb_extension.gz
 fi
 # also uplo