Skip to content

Commit

Permalink
fix: ci
Browse files Browse the repository at this point in the history
  • Loading branch information
jonapap committed May 7, 2023
1 parent 496008c commit 4383a72
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .cargo/config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
rustflags = [
"-C", "linker=arm-none-eabi-gcc",
"-C", "linker=arm-none-eabi-gcc",
"-C", "link-arg=-nostartfiles",
"-C", "link-arg=-L/usr/arm-none-eabi/lib/thumb/v7e-m+fp/hard/",
"-C", "link-arg=-Tlink.x",
Expand Down
1 change: 1 addition & 0 deletions .cargo/config-ci
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ rustflags = [
"-C", "linker=arm-none-eabi-gcc",
"-C", "link-arg=-nostartfiles",
"-C", "link-arg=-L/root/gcc-arm-none-eabi-12.2.1-linux/arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi/arm-none-eabi/lib/thumb/v7e-m+fp/hard/",
"-C", "link-arg=-L/home/runner/gcc-arm-none-eabi-12.2.1-linux/arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi/arm-none-eabi/lib/thumb/v7e-m+fp/hard/",
"-C", "link-arg=-Tlink.x",
"-C", "link-arg=-Tdefmt.x",
"-C", "link-arg=-lc",
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
# Install CMake
- name: Install packages
run: sudo apt update && sudo apt install -y cmake libnewlib-dev
- name: Use correct cargo config
run: mv .cargo/config-ci .cargo/config
- name: Install Arm GNU Toolchain (arm-none-eabi-gcc)
uses: carlosperate/arm-none-eabi-gcc-action@v1
with:
release: 'latest'
release: '12.2.Rel1'
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/clippy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,19 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Install packages
run: sudo apt update && sudo apt install -y cmake libnewlib-dev
- name: Use correct cargo config
run: mv .cargo/config-ci .cargo/config
- name: Install Arm GNU Toolchain (arm-none-eabi-gcc)
uses: carlosperate/arm-none-eabi-gcc-action@v1
with:
release: '12.2.Rel1'
- uses: actions-rs/toolchain@v1
with:
components: clippy
toolchain: stable
target: thumbv7em-none-eabihf
- uses: actions-rs/clippy-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ jobs:
name: Deploy Documentation
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install packages
run: sudo apt update && sudo apt install -y cmake libnewlib-dev
- name: Use correct cargo config
run: mv .cargo/config-ci .cargo/config
- name: Install Arm GNU Toolchain (arm-none-eabi-gcc)
uses: carlosperate/arm-none-eabi-gcc-action@v1
with:
release: 'latest'
- uses: actions/checkout@v2
release: '12.2.Rel1'
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ opt-level = "s"
# symbols are nice and they don't increase the size on Flash
debug = true
lto = true
opt-level = "s"
opt-level = "s"
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "stable"
targets = ["thumbv7em-none-eabihf"]
targets = ["thumbv7em-none-eabihf"]

0 comments on commit 4383a72

Please sign in to comment.