Skip to content

Commit 19c0670

Browse files
committed
disable cross on CI
1 parent 601a79a commit 19c0670

3 files changed

Lines changed: 8 additions & 21 deletions

File tree

.github/workflows/build.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ jobs:
5050
job:
5151
# https://github.com/actions/runner-images
5252
# Linux
53-
- { target: aarch64-unknown-linux-gnu, os: ubuntu-24.04 }
5453
- { target: x86_64-unknown-linux-gnu, os: ubuntu-24.04 }
55-
- { target: i686-unknown-linux-gnu, os: ubuntu-24.04 }
5654
# OS X
5755
- { target: aarch64-apple-darwin, os: macos-15 }
5856
- { target: x86_64-apple-darwin, os: macos-15-intel }
@@ -69,17 +67,6 @@ jobs:
6967
with:
7068
targets: ${{ matrix.job.target }}
7169

72-
- name: Install cross
73-
if: runner.os == 'Linux'
74-
uses: taiki-e/install-action@v2
75-
with:
76-
tool: cross
77-
78-
- name: Overwrite build command env variable
79-
if: runner.os == 'Linux'
80-
shell: bash
81-
run: echo "BUILD_CMD=cross" >> $GITHUB_ENV
82-
8370
- name: Show version information
8471
shell: bash
8572
run: |
@@ -89,6 +76,12 @@ jobs:
8976
cargo -V
9077
rustc -V
9178
79+
- if: runner.os == 'Linux'
80+
shell: bash
81+
run: sudo apt-get update
82+
- if: runner.os == 'Linux'
83+
shell: bash
84+
run: sudo apt-get install -y libasound2-dev libudev-dev
9285
- shell: bash
9386
run: $BUILD_CMD build --release --target=${{ matrix.job.target }}
9487

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "firefly-emulator"
3-
version = "0.9.6"
3+
version = "0.9.7"
44
rust-version = "1.91.0"
55
edition = "2024"
66
description = "Desktop emulator for Firefly Zero"
@@ -24,9 +24,3 @@ minifb = "0.28.0"
2424
# [patch.crates-io]
2525
# firefly-hal = { path = "../firefly-hal" }
2626
# firefly-runtime = { path = "../firefly-runtime" }
27-
28-
[package.metadata.cross.build]
29-
pre-build = [
30-
"apt-get update",
31-
"apt-get install -y libasound2-dev:$CROSS_DEB_ARCH libudev-dev:$CROSS_DEB_ARCH",
32-
]

0 commit comments

Comments
 (0)