Skip to content

Commit 6d2dff7

Browse files
authored
fix(cubestore): Support macOS 11 for standalone binary (#6060)
1 parent 70e68ae commit 6d2dff7

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

.github/workflows/publish.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,8 @@ jobs:
588588
strip: true
589589
# cubestored.exe: CantPackException: superfluous data between sections
590590
compress: false
591-
- os: macos-latest
591+
# Please use minimal possible version of macOS, because it produces constraint on libstdc++
592+
- os: macos-11
592593
target: x86_64-apple-darwin
593594
executable_name: cubestored
594595
cross: false
@@ -648,11 +649,6 @@ jobs:
648649
if: ${{ !matrix.cross }}
649650
run: |
650651
cd rust/cubestore && cargo build --release --target=${{ matrix.target }}
651-
- name: Brew update & install upx (workaround to use upx from github, instead of bintray)
652-
if: ${{ matrix.os == 'macos-latest' }}
653-
run: |
654-
brew update
655-
brew install upx
656652
- name: Compress binaries
657653
uses: svenstaro/upx-action@v2
658654
if: ${{ matrix.compress }}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,8 @@ jobs:
194194
strip: true
195195
# cubestored: CantPackException: bad DT_HASH nbucket=0x344 len=0x1890
196196
compress: false
197-
- os: macos-latest
197+
# Please use minimal possible version of macOS, because it produces constraint on libstdc++
198+
- os: macos-11
198199
target: x86_64-apple-darwin
199200
executable_name: cubestored
200201
cross: false

.github/workflows/rust-cubestore.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ jobs:
134134
strip: true
135135
# cubestored.exe: CantPackException: superfluous data between sections
136136
compress: false
137-
- os: macos-latest
137+
# Please use minimal possible version of macOS, because it produces constraint on libstdc++
138+
- os: macos-11
138139
target: x86_64-apple-darwin
139140
executable_name: cubestored
140141
cross: false
@@ -194,11 +195,6 @@ jobs:
194195
if: ${{ !matrix.cross }}
195196
run: |
196197
cd rust/cubestore && cargo build --release --target=${{ matrix.target }}
197-
- name: Brew update & install upx (workaround to use upx from github, instead of bintray)
198-
if: ${{ matrix.os == 'macos-latest' }}
199-
run: |
200-
brew update
201-
brew install upx
202198
- name: Compress binaries
203199
uses: svenstaro/upx-action@v2
204200
if: ${{ matrix.compress }}

0 commit comments

Comments
 (0)