Skip to content

Commit ca91422

Browse files
committed
chore: separate
1 parent cd0e668 commit ca91422

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

.github/workflows/publish.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,16 +153,17 @@ jobs:
153153
strategy:
154154
matrix:
155155
node-version: [22.x]
156-
os-version: ["macos-14"]
157156
target: ["x86_64-apple-darwin", "aarch64-apple-darwin"]
158157
python-version: ["3.9", "3.10", "3.11", "3.12", "fallback"]
159158
include:
160159
- target: x86_64-apple-darwin
160+
os-version: macos-15-intel
161161
package_target_arch: x64
162162
package_target_platform: darwin
163163
package_target_libc: unknown
164164
tar_executable: gtar
165165
- target: aarch64-apple-darwin
166+
os-version: macos-14
166167
package_target_arch: arm64
167168
package_target_platform: darwin
168169
package_target_libc: unknown
@@ -678,7 +679,7 @@ jobs:
678679
tar_executable: tar
679680
# Please use minimal possible version of macOS, because it produces constraint on libstdc++
680681
- target: x86_64-apple-darwin
681-
os: macos-14
682+
os: macos-15-intel
682683
executable_name: cubestored
683684
# upx has been disabled because it is crashing for macOS Ventura or above! It was disabled on 2024-09-05.
684685
strip: false

.github/workflows/rust-cubesql.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,20 +232,25 @@ jobs:
232232
matrix:
233233
# We do not need to test under all versions, we do it under linux
234234
node-version: [22.x]
235-
os-version: ["macos-14"]
236235
target: ["x86_64-apple-darwin", "aarch64-apple-darwin"]
237236
include:
238237
- target: x86_64-apple-darwin
238+
os-version: macos-15-intel
239239
python-version: "3.9"
240240
- target: x86_64-apple-darwin
241+
os-version: macos-15-intel
241242
python-version: "3.10"
242243
- target: x86_64-apple-darwin
244+
os-version: macos-15-intel
243245
python-version: "3.11"
244246
- target: x86_64-apple-darwin
247+
os-version: macos-15-intel
245248
python-version: "3.12"
246249
- target: x86_64-apple-darwin
250+
os-version: macos-15-intel
247251
python-version: "fallback"
248252
- target: aarch64-apple-darwin
253+
os-version: macos-14
249254
python-version: "fallback"
250255
fail-fast: false
251256

.github/workflows/rust-cubestore-master.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ jobs:
180180
# cubestored.exe: CantPackException: superfluous data between sections
181181
compress: false
182182
# Please use minimal possible version of macOS, because it produces constraint on libstdc++
183-
- os: macos-14
183+
- os: macos-15-intel
184184
target: x86_64-apple-darwin
185185
executable_name: cubestored
186186
# 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:
199199
run: rustup set auto-self-update disable
200200
if: contains(runner.os, 'windows')
201201
shell: bash
202-
- name: Install Rust target for cross-compilation
203-
if: matrix.target == 'x86_64-apple-darwin'
204-
run: rustup target add x86_64-apple-darwin
205-
working-directory: rust/cubestore
206202
- uses: Swatinem/rust-cache@v2
207203
with:
208204
workspaces: ./rust/cubestore -> target

.github/workflows/rust-cubestore.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
# cubestored.exe: CantPackException: superfluous data between sections
120120
compress: false
121121
# Please use minimal possible version of macOS, because it produces constraint on libstdc++
122-
- os: macos-14
122+
- os: macos-15-intel
123123
target: x86_64-apple-darwin
124124
executable_name: cubestored
125125
# 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:
138138
run: rustup set auto-self-update disable
139139
if: contains(runner.os, 'windows')
140140
shell: bash
141-
- name: Install Rust target for cross-compilation
142-
if: matrix.target == 'x86_64-apple-darwin'
143-
run: rustup target add x86_64-apple-darwin
144-
working-directory: rust/cubestore
145141
- uses: Swatinem/rust-cache@v2
146142
with:
147143
workspaces: ./rust/cubestore -> target

0 commit comments

Comments
 (0)