From 506ec0139d7cd2ef3fd2ecaf6bd7ac771e7cae56 Mon Sep 17 00:00:00 2001 From: Sam Ansmink Date: Mon, 14 Oct 2024 14:45:15 +0200 Subject: [PATCH 1/2] bump to v1.1.2 --- .github/workflows/MainDistributionPipeline.yml | 10 +++++----- duckdb | 2 +- extension-ci-tools | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml index de89697..3a530b9 100644 --- a/.github/workflows/MainDistributionPipeline.yml +++ b/.github/workflows/MainDistributionPipeline.yml @@ -14,20 +14,20 @@ concurrency: jobs: duckdb-stable-build: name: Build extension binaries - uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.1.1 + uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.1.2 with: extension_name: iceberg - duckdb_version: v1.1.1 - ci_tools_version: v1.1.1 + duckdb_version: v1.1.2 + ci_tools_version: v1.1.2 exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools' duckdb-stable-deploy: name: Deploy extension binaries needs: duckdb-stable-build - uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.1.1 + uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.1.2 secrets: inherit with: extension_name: iceberg - duckdb_version: v1.1.1 + duckdb_version: v1.1.2 exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools' deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }} diff --git a/duckdb b/duckdb index af39bd0..f680b7d 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit af39bd0dcf66876e09ac2a7c3baa28fe1b301151 +Subproject commit f680b7d08f56183391b581077d4baf589e1cc8bd diff --git a/extension-ci-tools b/extension-ci-tools index 00831df..f5594c6 160000 --- a/extension-ci-tools +++ b/extension-ci-tools @@ -1 +1 @@ -Subproject commit 00831df06713072df217d3fb2f6b5e0fae78742f +Subproject commit f5594c61803daee122a5245afb817966e1a4545c From 32c6adf1598acb8be2eb17f742d95b488de330e7 Mon Sep 17 00:00:00 2001 From: Sam Ansmink Date: Mon, 14 Oct 2024 15:37:58 +0200 Subject: [PATCH 2/2] allow break system packages --- .github/workflows/Rest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Rest.yml b/.github/workflows/Rest.yml index 89e656e..3886c0b 100644 --- a/.github/workflows/Rest.yml +++ b/.github/workflows/Rest.yml @@ -15,6 +15,7 @@ jobs: VCPKG_TARGET_TRIPLET: 'x64-linux' GEN: Ninja VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake + PIP_BREAK_SYSTEM_PACKAGES: 1 steps: - name: Install required ubuntu packages