From faaa397d299f360c0e35a75801e1a086efdf83ca Mon Sep 17 00:00:00 2001 From: Dmitry Patsura Date: Tue, 18 Nov 2025 19:59:01 +0100 Subject: [PATCH 1/4] 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 90e7d7b559748..2c409c346a202 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: @@ -678,7 +678,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 db2c66df847bd..ce19081e8477a 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 4468563362fa5..2008bba988669 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 439e8b8f7336393599148b2db52bd17190842813 Mon Sep 17 00:00:00 2001 From: Dmitry Patsura Date: Tue, 18 Nov 2025 20:08:45 +0100 Subject: [PATCH 2/4] 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 ce19081e8477a..ebde8fde81c18 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 2008bba988669..b0897b73c1741 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 518726b96b817c32fa8c18f64acc3ec9783708c3 Mon Sep 17 00:00:00 2001 From: Dmitry Patsura Date: Tue, 18 Nov 2025 20:22:28 +0100 Subject: [PATCH 3/4] 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 ebde8fde81c18..c213ba1ee92c7 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 b0897b73c1741..b51195b80bd68 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 cd0e6683a0a40b3b383c9c1225aeee25f8804bcb Mon Sep 17 00:00:00 2001 From: Dmitry Patsura Date: Tue, 18 Nov 2025 20:25:36 +0100 Subject: [PATCH 4/4] 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",