Skip to content

Commit 5ae563d

Browse files
committed
Merge #51: Add no-std tests
1747c8a Add no-std tests (Nick Johnson) 0ad6c7d Fix integration lock file (Nick Johnson) Pull request description: Testing out the new cargo-rbmt thing where it tests no-std if it detects it. Required switching to `#![no_std]` since cargo-rbmt doesn't do any parsing, but this is kind of easier to read anyways? Not sure how terrible it is to have to install the ARM compiler like this. ACKs for top commit: tcharding: ACK 1747c8a Tree-SHA512: 4c16cbe72f1638f516aa1afdbdad178d4ef4031d7bdb0bd63fa173f99ba37eb9d2a4f7e937b64fec4edf59b4433446ae3070c369283119af93f946ac205a27e9
2 parents 8447e82 + 1747c8a commit 5ae563d

File tree

6 files changed

+897
-13
lines changed

6 files changed

+897
-13
lines changed

.github/actions/prepare/action.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,26 @@ inputs:
1212
runs:
1313
using: "composite"
1414
steps:
15+
- name: "Install ARM cross-compiler for no-std"
16+
shell: bash
17+
run: |
18+
sudo apt-get update && sudo apt-get install -y gcc-arm-none-eabi
19+
echo "CC_thumbv7m_none_eabi=arm-none-eabi-gcc" >> $GITHUB_ENV
20+
1521
- name: "Determine toolchain"
1622
id: toolchain
1723
shell: bash
1824
run: |
19-
if [ "${{ inputs.toolchain }}" = "nightly" ]; then
20-
TOOLCHAIN="$(cat nightly-version)"
21-
else
22-
TOOLCHAIN="${{ inputs.toolchain }}"
23-
fi
25+
[[ "${{ inputs.toolchain }}" == "nightly" ]] && TOOLCHAIN=$(cat nightly-version) || TOOLCHAIN="${{ inputs.toolchain }}"
2426
echo "version=$TOOLCHAIN" >> $GITHUB_OUTPUT
2527
2628
- name: "Setup requested toolchain"
2729
uses: actions-rust-lang/setup-rust-toolchain@v1
2830
with:
29-
toolchain: ${{ steps.toolchain.outputs.version }}
31+
toolchain: stable,${{ steps.toolchain.outputs.version }}
3032
components: ${{ inputs.components }}
33+
target: thumbv7m-none-eabi
3134

3235
- name: "Install RBMT"
3336
shell: bash
34-
run: cargo install --git https://github.com/rust-bitcoin/rust-bitcoin-maintainer-tools.git --rev "$(cat rbmt-version)" cargo-rbmt --locked
37+
run: cargo +stable install --git https://github.com/rust-bitcoin/rust-bitcoin-maintainer-tools.git --rev "$(cat rbmt-version)" cargo-rbmt --locked

.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# .gitignore for rust-psbt repository.
22

3-
# Lock files
4-
Cargo.lock
3+
# Ignore library lock file.
4+
/Cargo.lock
55

66
# Build artifacts
77
target
8-

0 commit comments

Comments
 (0)