Skip to content

Commit 12fec8b

Browse files
committed
Merge remote-tracking branch 'origin/main' into rr/core-321-fragment-metdata-global-order-bounds
2 parents 47df461 + 1bc1ad6 commit 12fec8b

File tree

108 files changed

+1194
-2758
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+1194
-2758
lines changed

.github/workflows/ci-linux_mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ jobs:
143143
if: inputs.manylinux
144144
run: |
145145
set -e pipefail
146-
yum install -y redhat-lsb-core perl-IPC-Cmd curl zip unzip tar
146+
yum install -y redhat-lsb-core perl-IPC-Cmd perl-Time-Piece curl zip unzip tar
147147
148148
# This must happen after checkout, because checkout would remove the directory.
149149
- name: Install Ninja

.github/workflows/ci-rest.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: REST CI
2+
3+
on:
4+
workflow_call:
5+
6+
jobs:
7+
rest-ci:
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
# For easy access to lookup dispatched CI job.
12+
- name: Print URL for REST CI actions
13+
run: echo https://github.com/TileDB-Inc/TileDB-Internal/actions
14+
15+
# If this workflow fails on the remote repository, this CI job will also fail.
16+
- name: Workflow dispatch to REST CI
17+
id: trigger-step
18+
uses: the-actions-org/workflow-dispatch@v4
19+
env:
20+
TILEDB_REST_CI_PAT: secrets.TILEDB_REST_CI_PAT
21+
if: env.TILEDB_REST_CI_PAT != null
22+
with:
23+
repo: TileDB-Inc/TileDB-Internal
24+
# Trigger workflow on TileDB-Internal checked out at this ref.
25+
ref: "main"
26+
workflow: rest-ci.yml
27+
token: ${{ secrets.TILEDB_REST_CI_PAT }}
28+
# The references set here will be passed to REST CI to checkout for testing.
29+
# These can be temporarily modified if you want to test your changes against a specific branch.
30+
# github.head_ref will only be set for PRs, so fallback to github.ref_name if triggered via push event.
31+
inputs: |
32+
{
33+
"tiledb_ref": "${{ github.event.inputs.ref || github.head_ref || github.ref_name }}",
34+
"tiledb_cloud_rest_ref": "master",
35+
"tiledb_server_ref": "main"
36+
}
37+
wait-for-completion-timeout: 120m

.github/workflows/full-ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,10 @@ jobs:
133133
ci_docker:
134134
uses: ./.github/workflows/build-dockerfile.yml
135135

136+
ci_rest:
137+
uses: ./.github/workflows/ci-rest.yml
138+
secrets: inherit
139+
136140
# dummy job for branch protection check
137141
full_ci_passed:
138142
needs: [

.gitlab-ci.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

cmake/Options/TileDBToolchain.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ if (NOT DEFINED CMAKE_TOOLCHAIN_FILE)
3636
# Inspired from https://github.com/Azure/azure-sdk-for-cpp/blob/azure-core_1.10.3/cmake-modules/AzureVcpkg.cmake
3737
message("TILEDB_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.")
3838
# To help with resolving conflicts, when you update the commit, also update its date.
39-
set(VCPKG_COMMIT_STRING ea2a964f9303270322cf3f2d51c265ba146c422d) # 2025-04-01
39+
set(VCPKG_COMMIT_STRING 3b9d086009cc1c2256e9c28ad44a00036fbd9b26) # 2025-10-24
4040
message("Vcpkg commit string used: ${VCPKG_COMMIT_STRING}")
4141
include(FetchContent)
4242
FetchContent_Declare(

ports/README.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,4 @@ For ease of review when patching existing ports, you are recommended to make one
3232

3333
| Port | Reason |
3434
|---------------|--------------------------------------------------------------------------|
35-
| `aws-c-cal` | Patching to remove unused OpenSSL dependency on Windows (vcpkg PR 44996) |
36-
| `aws-sdk-cpp` | Patching to fix MinGW build failures. |
37-
| `capnproto` | Patching to fix compatibility with CMake 4.0 (PR 2272) |
38-
| `crc32c` | Patching to fix compatibility with CMake 4.0 (PR 68) |
39-
| `fmt` | Patching to update to version 1.11.4 (vcpkg PR 44774) |
4035
| `libfaketime` | Port does not yet exist upstream |
41-
| `s2n` | Patching to fix compatibility with CMake 4.0 (PR 4933) |
42-
| `spdlog` | Patching to compile with `-fvisibility=hidden` |

ports/aws-c-cal/portfile.cmake

Lines changed: 0 additions & 38 deletions
This file was deleted.

ports/aws-c-cal/remove-libcrypto-messages.patch

Lines changed: 0 additions & 14 deletions
This file was deleted.

ports/aws-c-cal/vcpkg.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

ports/aws-sdk-cpp/find-dependency.patch

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)