Skip to content

Commit 95288ec

Browse files
committed
Get cargo-binutils as a binary package.
1 parent 6723b0d commit 95288ec

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

.github/workflows/rust.yml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,40 @@ jobs:
1111
uses: actions/checkout@v3
1212
with:
1313
submodules: true
14+
1415
- name: Check Syntax
1516
run: |
1617
cargo check
18+
1719
- name: Test
1820
run: |
1921
cargo test --lib
22+
2023
- name: Install Targets and Tools
2124
run: |
2225
rustup target add thumbv7em-none-eabi
2326
rustup target add thumbv7m-none-eabi
2427
rustup target add thumbv6m-none-eabi
2528
rustup component add llvm-tools-preview
26-
cargo install cargo-binutils
29+
30+
- name: Install tools
31+
uses: taiki-e/install-action@v2
32+
with:
33+
tool: cargo-binutils@0.3.6
34+
2735
- name: Build
2836
run: |
2937
./build.sh --verbose
38+
39+
- name: Upload Artifacts
40+
uses: actions/upload-artifact@v3
41+
if: ${{success()}}
42+
with:
43+
name: Artifacts
44+
if-no-files-found: error
45+
path: |
46+
./release/
47+
3048
- name: Upload files to Release
3149
if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/')
3250
uses: softprops/action-gh-release@v1

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ for TARGET_ARCH in thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabi; do
1313
echo "BINARY is ${BINARY}"
1414
cargo build $* --release --target=${TARGET_ARCH} --bin ${BINARY}
1515
# objcopy would do the build for us first, but it doesn't have good build output
16-
cargo objcopy $* --release --target=${TARGET_ARCH} --bin ${BINARY} -- -O binary ${RELEASE_DIR}/${TARGET_ARCH}-${BINARY}-libneotron_os.bin
16+
rust-objcopy -O binary ./target/${TARGET_ARCH}/release/${BINARY} ${RELEASE_DIR}/${TARGET_ARCH}-${BINARY}-libneotron_os.bin
1717
# Keep the ELF file too (for debugging)
1818
cp ./target/${TARGET_ARCH}/release/${BINARY} ${RELEASE_DIR}/${TARGET_ARCH}-${BINARY}-libneotron_os.elf
1919
done

0 commit comments

Comments
 (0)