Skip to content

Commit be85be5

Browse files
authored
Revert "Update CI deployment" (#200)
* Reverts #139 This is required to unblock updating to Rust 1.85, which is required by the upcoming egui release: * #193
1 parent 549f881 commit be85be5

File tree

1 file changed

+17
-23
lines changed

1 file changed

+17
-23
lines changed

.github/workflows/rust.yml

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,17 @@ jobs:
111111
- os: macos-latest
112112
TARGET: aarch64-apple-darwin
113113

114+
- os: macos-latest
115+
TARGET: x86_64-apple-darwin
116+
114117
- os: ubuntu-latest
115-
TARGET: aarch64-unknown-linux-gnu
118+
TARGET: arm-unknown-linux-musleabihf
116119

117120
- os: ubuntu-latest
118-
TARGET: armv7-unknown-linux-gnueabihf
121+
TARGET: armv7-unknown-linux-musleabihf
119122

120123
- os: ubuntu-latest
121-
TARGET: x86_64-unknown-linux-gnu
124+
TARGET: x86_64-unknown-linux-musl
122125

123126
- os: windows-latest
124127
TARGET: x86_64-pc-windows-msvc
@@ -129,26 +132,17 @@ jobs:
129132
run: echo "${{ matrix.TARGET }}"
130133

131134
- uses: actions/checkout@master
132-
- name: Install build dependencies - Rustup
133-
run: |
134-
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable --profile default --target ${{ matrix.TARGET }} -y
135-
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
136-
137-
# For linux, it's necessary to use cross from the git repository to avoid glibc problems
138-
# Ref: https://github.com/cross-rs/cross/issues/1510
139-
- name: Install cross for linux
140-
if: contains(matrix.TARGET, 'linux')
141-
run: |
142-
cargo install cross --git https://github.com/cross-rs/cross --rev 1b8cf50d20180c1a394099e608141480f934b7f7
143-
144-
- name: Install cross for mac and windows
145-
if: ${{ !contains(matrix.TARGET, 'linux') }}
146-
run: |
147-
cargo install cross
148-
149-
- name: Build
150-
run: |
151-
cross build --verbose --release --target=${{ matrix.TARGET }}
135+
- uses: actions-rs/[email protected]
136+
with:
137+
toolchain: stable
138+
target: ${{ matrix.TARGET }}
139+
override: true
140+
141+
- uses: actions-rs/cargo@v1
142+
with:
143+
use-cross: true
144+
command: build
145+
args: --verbose --release --target=${{ matrix.TARGET }}
152146

153147
- name: Rename
154148
run: cp target/${{ matrix.TARGET }}/release/eframe_template${{ matrix.EXTENSION }} eframe_template-${{ matrix.TARGET }}${{ matrix.EXTENSION }}

0 commit comments

Comments
 (0)