Skip to content

Commit bc4cda2

Browse files
committed
fix: try fix compile
1 parent ade05f5 commit bc4cda2

File tree

1 file changed

+20
-12
lines changed

1 file changed

+20
-12
lines changed

.github/workflows/rust.yml

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,20 @@ jobs:
3535
strategy:
3636
fail-fast: false
3737
matrix:
38-
os: [ubuntu-22.04, macOS-latest]
38+
os: [ubuntu-22.04, macOS-latest, macOS-15-intel]
3939
include:
40-
- name: linux
40+
- name: ubuntu
4141
os: ubuntu-22.04
4242
artifact_name: target/release/RustPlayer
4343
asset_name: RustPlayer-linux-amd64
4444
- name: macos
4545
os: macOS-latest
4646
artifact_name: target/release/RustPlayer
47-
asset_name: RustPlayer-macos
47+
asset_name: RustPlayer-macos-arm64
48+
- name: macos
49+
os: macOS-15-intel
50+
artifact_name: target/release/RustPlayer
51+
asset_name: RustPlayer-macos-x64
4852
steps:
4953
- uses: actions/checkout@v2
5054
with:
@@ -55,10 +59,13 @@ jobs:
5559
- run: rustup toolchain install ${{ inputs.RUST_TOOLCHAIN }} --profile minimal
5660
- uses: Swatinem/rust-cache@v2
5761

58-
- name: Install cargo bundle
59-
if: matrix.os == 'ubuntu-22.04'
62+
- name: Install cargo bundle and deps
63+
if: matrix.name == 'ubuntu'
6064
shell: bash
6165
run: |
66+
sudo apt update -y
67+
sudo apt-get install -y pkg-config libasound2-dev libssl-dev libclang-dev
68+
6269
pushd /tmp
6370
git clone https://github.com/burtonageo/cargo-bundle
6471
pushd cargo-bundle
@@ -67,24 +74,24 @@ jobs:
6774
popd
6875
6976
- name: build RustPlayer for macOS
70-
if: matrix.os == 'macOS-latest'
77+
if: matrix.name == 'macos'
7178
run: cargo build --release
7279

7380
- name: build RustPlayer for Linux
74-
if: matrix.os == 'ubuntu-22.04'
81+
if: matrix.name == 'ubuntu'
7582
run: cargo bundle --release
7683

7784
- name: bundle RustPlayer for macOS
78-
if: matrix.os == 'macOS-latest'
85+
if: matrix.name == 'macos'
7986
run: |
8087
# npm install --global create-dmg
8188
# for name in target/release/bundle/osx/*.app; do
8289
# create-dmg $name || true
8390
# done
84-
mv target/release/rustplayer rustplayer-binary-macos
91+
mv target/release/rustplayer ${{ matrix.asset_name }}
8592
8693
- name: Publish Release for linux
87-
if: matrix.os == 'ubuntu-22.04'
94+
if: matrix.name == 'ubuntu'
8895
uses: softprops/action-gh-release@v1
8996
with:
9097
prerelease: true
@@ -93,13 +100,13 @@ jobs:
93100
target/release/bundle/deb/*.deb
94101
95102
- name: Publish Release for macos
96-
if: matrix.os == 'macOS-latest'
103+
if: matrix.name == 'macos'
97104
uses: softprops/action-gh-release@v1
98105
with:
99106
prerelease: true
100107
tag_name: ${{ env.TAG_NAME }}
101108
files: |
102-
rustplayer-binary-macos
109+
${{ matrix.asset_name }}
103110
104111
build-on-windows:
105112
runs-on: windows-latest
@@ -119,6 +126,7 @@ jobs:
119126
- uses: actions/checkout@v2
120127
with:
121128
submodules: 'recursive'
129+
- uses: ilammy/msvc-dev-cmd@v1
122130
- run: rustup toolchain install ${{ inputs.RUST_TOOLCHAIN }} --profile minimal
123131
- uses: Swatinem/rust-cache@v2
124132

0 commit comments

Comments
 (0)