Merge pull request #94 from samansmink/prepare-for-v1.2.0

Prepare for v1.2.0
duckdb · Jan 8, 2025 · 3060b30 · 3060b30
2 parents 3bcaa7e + f8239a6
commit 3060b30
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 32 deletions.
diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
@@ -14,21 +14,21 @@ concurrency:
 jobs:
   duckdb-stable-build:
     name: Build extension binaries
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.1.3
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
       extension_name: iceberg
-      duckdb_version: v1.1.3
-      ci_tools_version: v1.1.3
-      exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
+      duckdb_version: main
+      ci_tools_version: main
+      exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64_mingw'
 
   duckdb-stable-deploy:
     name: Deploy extension binaries
     needs: duckdb-stable-build
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.1.3
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
     secrets: inherit
     with:
       extension_name: iceberg
-      duckdb_version: v1.1.3
-      ci_tools_version: v1.1.3
-      exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
+      duckdb_version: main
+      ci_tools_version: main
+      exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64_mingw'
       deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
diff --git a/.github/workflows/Rest.yml b/.github/workflows/Rest.yml
@@ -1,5 +1,5 @@
 name: Rest
-on: [pull_request, repository_dispatch]
+on: [push, pull_request, repository_dispatch]
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ github.ref != 'refs/heads/main' || github.sha }}
   cancel-in-progress: true
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       VCPKG_TARGET_TRIPLET: 'x64-linux'
-      GEN: Ninja
+      GEN: ninja
       VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
       PIP_BREAK_SYSTEM_PACKAGES: 1
 
@@ -29,28 +29,15 @@ jobs:
           sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
           sudo chmod +x /usr/local/bin/docker-compose
 
-      - name: Install Git 2.18.5
-        run: |
-          wget https://github.com/git/git/archive/refs/tags/v2.18.5.tar.gz
-          tar xvf v2.18.5.tar.gz
-          cd git-2.18.5
-          make
-          sudo make prefix=/usr install
-          git --version
-
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: 'true'
 
-      - name: Setup ManyLinux2014
-        run: |
-          ./duckdb/scripts/setup_manylinux2014.sh general aws-cli ccache ssh openssl python_alias
-
       - name: Setup vcpkg
         uses: lukka/[email protected]
         with:
-          vcpkgGitCommitId: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6
+          vcpkgGitCommitId: 5e5d0e1cd7785623065e77eff011afdeec1a3574
 
       - name: Build extension
         env:

diff --git a/Makefile b/Makefile
@@ -4,6 +4,9 @@ PROJ_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 EXT_NAME=iceberg
 EXT_CONFIG=${PROJ_DIR}extension_config.cmake
 
+# We need this for testing
+CORE_EXTENSIONS='httpfs'
+
 # Include the Makefile from extension-ci-tools
 include extension-ci-tools/makefiles/duckdb_extension.Makefile
 

diff --git a/duckdb b/duckdb
diff --git a/extension-ci-tools b/extension-ci-tools
diff --git a/extension_config.cmake b/extension_config.cmake
@@ -4,6 +4,4 @@
 duckdb_extension_load(iceberg
     SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}
     LOAD_TESTS
-)
-
-duckdb_extension_load(httpfs)
+)
diff --git a/src/iceberg_functions/iceberg_scan.cpp b/src/iceberg_functions/iceberg_scan.cpp
@@ -205,7 +205,7 @@ static unique_ptr<TableRef> MakeScanExpression(vector<Value> &data_file_values,
 	auto select_node = make_uniq<SelectNode>();
 	select_node->from_table = std::move(join_node);
 	auto select_expr = make_uniq<StarExpression>();
-	select_expr->exclude_list = {"filename", "file_row_number"};
+	select_expr->exclude_list = {QualifiedColumnName("filename"), QualifiedColumnName("file_row_number")};
 	vector<unique_ptr<ParsedExpression>> select_exprs;
 	select_exprs.push_back(std::move(select_expr));
 	select_node->select_list = std::move(select_exprs);

diff --git a/vcpkg.json b/vcpkg.json
@@ -11,7 +11,7 @@
       "./vcpkg_ports"
     ]
   },
-  "builtin-baseline": "a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6",
+  "builtin-baseline": "5e5d0e1cd7785623065e77eff011afdeec1a3574",
   "overrides": [
     {
       "name": "openssl",
+3 −2		.github/workflows/TestCITools.yml
+1 −1		.github/workflows/_extension_distribution.yml
+5 −0		config/distribution_matrix.json
+9 −9		docker/linux_amd64/Dockerfile
+84 −0		docker/linux_amd64_musl/Dockerfile
+9 −9		docker/linux_arm64/Dockerfile
+5 −4		makefiles/c_api_extensions/base.Makefile