From 3305f2eb4a4c743173deb670884ad154664600be Mon Sep 17 00:00:00 2001 From: Dmitry Patsura Date: Tue, 18 Nov 2025 19:59:01 +0100 Subject: [PATCH 1/5] chore(ci): Upgrade macos to 14 (13 is deprecated) --- .github/workflows/publish.yml | 4 ++-- .github/workflows/rust-cubestore-master.yml | 2 +- .github/workflows/rust-cubestore.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 02a94c834e3a9..b0ffe06ed5d2b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -153,7 +153,7 @@ jobs: strategy: matrix: node-version: [22.x] - os-version: ["macos-13"] + os-version: ["macos-14"] target: ["x86_64-apple-darwin", "aarch64-apple-darwin"] python-version: ["3.9", "3.10", "3.11", "3.12", "fallback"] include: @@ -682,7 +682,7 @@ jobs: tar_executable: tar # Please use minimal possible version of macOS, because it produces constraint on libstdc++ - target: x86_64-apple-darwin - os: macos-13 + os: macos-14 executable_name: cubestored # upx has been disabled because it is crashing for macOS Ventura or above! It was disabled on 2024-09-05. strip: false diff --git a/.github/workflows/rust-cubestore-master.yml b/.github/workflows/rust-cubestore-master.yml index d4a35704a6245..9c1c966f6981a 100644 --- a/.github/workflows/rust-cubestore-master.yml +++ b/.github/workflows/rust-cubestore-master.yml @@ -180,7 +180,7 @@ jobs: # cubestored.exe: CantPackException: superfluous data between sections compress: false # Please use minimal possible version of macOS, because it produces constraint on libstdc++ - - os: macos-13 + - os: macos-14 target: x86_64-apple-darwin executable_name: cubestored # upx has been disabled because it is crashing for macOS Ventura or above! It was disabled on 2024-09-05. diff --git a/.github/workflows/rust-cubestore.yml b/.github/workflows/rust-cubestore.yml index 5e814eacf4fc6..1c87e1bda0d3c 100644 --- a/.github/workflows/rust-cubestore.yml +++ b/.github/workflows/rust-cubestore.yml @@ -119,7 +119,7 @@ jobs: # cubestored.exe: CantPackException: superfluous data between sections compress: false # Please use minimal possible version of macOS, because it produces constraint on libstdc++ - - os: macos-13 + - os: macos-14 target: x86_64-apple-darwin executable_name: cubestored # upx has been disabled because it is crashing for macOS Ventura or above! It was disabled on 2024-09-05. From 66894de845be5492433a52798d8a468b368a29fa Mon Sep 17 00:00:00 2001 From: Dmitry Patsura Date: Tue, 18 Nov 2025 20:08:45 +0100 Subject: [PATCH 2/5] chore: fix --- .github/workflows/rust-cubestore-master.yml | 3 +++ .github/workflows/rust-cubestore.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/rust-cubestore-master.yml b/.github/workflows/rust-cubestore-master.yml index 9c1c966f6981a..c2a239089a5e6 100644 --- a/.github/workflows/rust-cubestore-master.yml +++ b/.github/workflows/rust-cubestore-master.yml @@ -199,6 +199,9 @@ jobs: run: rustup set auto-self-update disable if: contains(runner.os, 'windows') shell: bash + - name: Install Rust target for cross-compilation + if: matrix.target == 'x86_64-apple-darwin' + run: rustup target add x86_64-apple-darwin - uses: Swatinem/rust-cache@v2 with: workspaces: ./rust/cubestore -> target diff --git a/.github/workflows/rust-cubestore.yml b/.github/workflows/rust-cubestore.yml index 1c87e1bda0d3c..d466179ed9a92 100644 --- a/.github/workflows/rust-cubestore.yml +++ b/.github/workflows/rust-cubestore.yml @@ -138,6 +138,9 @@ jobs: run: rustup set auto-self-update disable if: contains(runner.os, 'windows') shell: bash + - name: Install Rust target for cross-compilation + if: matrix.target == 'x86_64-apple-darwin' + run: rustup target add x86_64-apple-darwin - uses: Swatinem/rust-cache@v2 with: workspaces: ./rust/cubestore -> target From d6b2f032e6a183d14f6cde98e8ff20e65345c4c3 Mon Sep 17 00:00:00 2001 From: Dmitry Patsura Date: Tue, 18 Nov 2025 20:22:28 +0100 Subject: [PATCH 3/5] chore: fix --- .github/workflows/rust-cubestore-master.yml | 1 + .github/workflows/rust-cubestore.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/rust-cubestore-master.yml b/.github/workflows/rust-cubestore-master.yml index c2a239089a5e6..444566f06e15e 100644 --- a/.github/workflows/rust-cubestore-master.yml +++ b/.github/workflows/rust-cubestore-master.yml @@ -202,6 +202,7 @@ jobs: - name: Install Rust target for cross-compilation if: matrix.target == 'x86_64-apple-darwin' run: rustup target add x86_64-apple-darwin + working-directory: rust/cubestore - uses: Swatinem/rust-cache@v2 with: workspaces: ./rust/cubestore -> target diff --git a/.github/workflows/rust-cubestore.yml b/.github/workflows/rust-cubestore.yml index d466179ed9a92..465fa54112520 100644 --- a/.github/workflows/rust-cubestore.yml +++ b/.github/workflows/rust-cubestore.yml @@ -141,6 +141,7 @@ jobs: - name: Install Rust target for cross-compilation if: matrix.target == 'x86_64-apple-darwin' run: rustup target add x86_64-apple-darwin + working-directory: rust/cubestore - uses: Swatinem/rust-cache@v2 with: workspaces: ./rust/cubestore -> target From 96b941a77004c612f59fac36a6af32a91dc87976 Mon Sep 17 00:00:00 2001 From: Dmitry Patsura Date: Tue, 18 Nov 2025 20:25:36 +0100 Subject: [PATCH 4/5] chore: update openssl-sys --- rust/cubestore/Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/cubestore/Cargo.lock b/rust/cubestore/Cargo.lock index 2bee7bd4b5925..07899c065d873 100644 --- a/rust/cubestore/Cargo.lock +++ b/rust/cubestore/Cargo.lock @@ -3305,9 +3305,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" dependencies = [ "cc", "libc", From bd056c4d3807a047dd8aa9d35e96c6b6d7881768 Mon Sep 17 00:00:00 2001 From: Dmitry Patsura Date: Mon, 8 Dec 2025 13:16:33 +0100 Subject: [PATCH 5/5] chore: separate --- .github/workflows/publish.yml | 5 +++-- .github/workflows/rust-cubesql.yml | 7 ++++++- .github/workflows/rust-cubestore-master.yml | 6 +----- .github/workflows/rust-cubestore.yml | 6 +----- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b0ffe06ed5d2b..69bc09b6d3c28 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -153,16 +153,17 @@ jobs: strategy: matrix: node-version: [22.x] - os-version: ["macos-14"] target: ["x86_64-apple-darwin", "aarch64-apple-darwin"] python-version: ["3.9", "3.10", "3.11", "3.12", "fallback"] include: - target: x86_64-apple-darwin + os-version: macos-15-intel package_target_arch: x64 package_target_platform: darwin package_target_libc: unknown tar_executable: gtar - target: aarch64-apple-darwin + os-version: macos-14 package_target_arch: arm64 package_target_platform: darwin package_target_libc: unknown @@ -682,7 +683,7 @@ jobs: tar_executable: tar # Please use minimal possible version of macOS, because it produces constraint on libstdc++ - target: x86_64-apple-darwin - os: macos-14 + os: macos-15-intel executable_name: cubestored # upx has been disabled because it is crashing for macOS Ventura or above! It was disabled on 2024-09-05. strip: false diff --git a/.github/workflows/rust-cubesql.yml b/.github/workflows/rust-cubesql.yml index 967de2813004a..1603c9756fe92 100644 --- a/.github/workflows/rust-cubesql.yml +++ b/.github/workflows/rust-cubesql.yml @@ -232,20 +232,25 @@ jobs: matrix: # We do not need to test under all versions, we do it under linux node-version: [22.x] - os-version: ["macos-14"] target: ["x86_64-apple-darwin", "aarch64-apple-darwin"] include: - target: x86_64-apple-darwin + os-version: macos-15-intel python-version: "3.9" - target: x86_64-apple-darwin + os-version: macos-15-intel python-version: "3.10" - target: x86_64-apple-darwin + os-version: macos-15-intel python-version: "3.11" - target: x86_64-apple-darwin + os-version: macos-15-intel python-version: "3.12" - target: x86_64-apple-darwin + os-version: macos-15-intel python-version: "fallback" - target: aarch64-apple-darwin + os-version: macos-14 python-version: "fallback" fail-fast: false diff --git a/.github/workflows/rust-cubestore-master.yml b/.github/workflows/rust-cubestore-master.yml index 444566f06e15e..325251283cf84 100644 --- a/.github/workflows/rust-cubestore-master.yml +++ b/.github/workflows/rust-cubestore-master.yml @@ -180,7 +180,7 @@ jobs: # cubestored.exe: CantPackException: superfluous data between sections compress: false # Please use minimal possible version of macOS, because it produces constraint on libstdc++ - - os: macos-14 + - os: macos-15-intel target: x86_64-apple-darwin executable_name: cubestored # upx has been disabled because it is crashing for macOS Ventura or above! It was disabled on 2024-09-05. @@ -199,10 +199,6 @@ jobs: run: rustup set auto-self-update disable if: contains(runner.os, 'windows') shell: bash - - name: Install Rust target for cross-compilation - if: matrix.target == 'x86_64-apple-darwin' - run: rustup target add x86_64-apple-darwin - working-directory: rust/cubestore - uses: Swatinem/rust-cache@v2 with: workspaces: ./rust/cubestore -> target diff --git a/.github/workflows/rust-cubestore.yml b/.github/workflows/rust-cubestore.yml index 465fa54112520..509e6b92a4ebe 100644 --- a/.github/workflows/rust-cubestore.yml +++ b/.github/workflows/rust-cubestore.yml @@ -119,7 +119,7 @@ jobs: # cubestored.exe: CantPackException: superfluous data between sections compress: false # Please use minimal possible version of macOS, because it produces constraint on libstdc++ - - os: macos-14 + - os: macos-15-intel target: x86_64-apple-darwin executable_name: cubestored # upx has been disabled because it is crashing for macOS Ventura or above! It was disabled on 2024-09-05. @@ -138,10 +138,6 @@ jobs: run: rustup set auto-self-update disable if: contains(runner.os, 'windows') shell: bash - - name: Install Rust target for cross-compilation - if: matrix.target == 'x86_64-apple-darwin' - run: rustup target add x86_64-apple-darwin - working-directory: rust/cubestore - uses: Swatinem/rust-cache@v2 with: workspaces: ./rust/cubestore -> target