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..c213ba1ee92c7 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. @@ -199,6 +199,10 @@ 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 4468563362fa5..b51195b80bd68 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. @@ -138,6 +138,10 @@ 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/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",