eric/duckdb-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into yl/add-get-url-tf

Browse Source
This commit is contained in:
Y.
2025-03-13 06:52:56 -04:00
committed by GitHub
parent 2236a0c60b 65b45f96ab
commit b53cae9421
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/MainDistributionPipeline.yml vendored
View File

@@ -18,7 +18,7 @@ jobs:
with: with:
ci_tools_version: main ci_tools_version: main
duckdb_version: main duckdb_version: main
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64_mingw' exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads'
extension_name: ui extension_name: ui
duckdb-next-patch-build: duckdb-next-patch-build:
@@ -27,7 +27,7 @@ jobs:
with: with:
ci_tools_version: v1.2.1 ci_tools_version: v1.2.1
duckdb_version: v1.2-histrionicus duckdb_version: v1.2-histrionicus
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64_mingw' exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads'
extension_name: ui extension_name: ui
duckdb-stable-build: duckdb-stable-build:
@@ -36,7 +36,7 @@ jobs:
with: with:
ci_tools_version: v1.2.1 ci_tools_version: v1.2.1
duckdb_version: v1.2.1 duckdb_version: v1.2.1
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64_mingw' exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads'
extension_name: ui extension_name: ui
duckdb-stable-deploy: duckdb-stable-deploy:
@@ -49,5 +49,5 @@ jobs:
extension_name: ui extension_name: ui
duckdb_version: v1.2.1 duckdb_version: v1.2.1
ci_tools_version: v1.2.1 ci_tools_version: v1.2.1
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64_mingw' exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads'
deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }} deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}

2
extension-ci-tools

Submodule extension-ci-tools updated: 58970c538d...00e6af0684

8
src/http_server.cpp
View File

@@ -247,13 +247,7 @@ void HttpServer::HandleGet(const httplib::Request &req,
httplib::Client client(remote_url); httplib::Client client(remote_url);
client.set_keep_alive(true); client.set_keep_alive(true);
// Provide a way to turn on or off server certificate verification, at least if (IsEnvEnabled("ui_disable_server_certificate_verification")) {
// for now, because it requires httplib to correctly get the root certficates
// on each platform, which doesn't appear to always work. Currently, default
// to no verification, until we understand when it breaks things.
if (IsEnvEnabled("ui_enable_server_certificate_verification")) {
client.enable_server_certificate_verification(true);
} else {
client.enable_server_certificate_verification(false); client.enable_server_certificate_verification(false);
} }