Skip to content

Commit 0f547ff

Browse files
Merge pull request #36 from Neotron-Compute/fix_tag_names
Copying build steps from Pico BMC.
2 parents 741bf54 + baee3e2 commit 0f547ff

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,25 @@
1-
name: Build
2-
31
on: [push, pull_request]
2+
name: Build (and Release)
43

54
env:
65
CARGO_TERM_COLOR: always
76

87
jobs:
98
build:
9+
name: Build (and Release)
1010
runs-on: ubuntu-latest
1111
steps:
12-
- name: Checkout Code
12+
- name: Checkout
1313
uses: actions/checkout@v3
1414
with:
1515
submodules: true
1616
fetch-depth: 0
1717

18-
- name: Install Rust
19-
uses: actions-rs/toolchain@v1
20-
with:
21-
profile: minimal
22-
toolchain: stable
23-
override: true
24-
target: thumbv6m-none-eabi
18+
- name: Add targets
19+
run: |
20+
rustup target add thumbv6m-none-eabi
2521
26-
- name: Build Code
22+
- name: Build neotron-pico-bios
2723
run: |
2824
cargo build --release --verbose
2925

build.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,15 @@ fn main() {
3232
// Generate a file containing the firmware version
3333
let version_output = std::process::Command::new("git")
3434
.current_dir(env::var_os("CARGO_MANIFEST_DIR").unwrap())
35-
.args(["describe", "--long", "--dirty"])
35+
.args(["describe", "--tags", "--dirty"])
3636
.output()
3737
.expect("running git-describe");
38+
39+
println!(
40+
"Version is {:?}",
41+
std::str::from_utf8(&version_output.stdout)
42+
);
43+
println!("Error is {:?}", std::str::from_utf8(&version_output.stderr));
3844
assert!(version_output.status.success());
3945

4046
// Remove the trailing newline

0 commit comments

Comments
 (0)