From 2016e772d312ee99522275a6c321c122483e8622 Mon Sep 17 00:00:00 2001
From: Will Sloan <will@848.email>
Date: Sun, 12 Jan 2025 21:33:30 -0500
Subject: [PATCH] Refactor firmware flasher into submodule
This is a lot cleaner than cd-ing above the repository (potentially
dangerous in CI because the state of the directory above the repository
is not guaranteed) and doing a 'git clone'. This will also allow
the submodule's commit to be pinned and not change without developer
intent.
---
.gitlab-ci.yml | 12 +++++-------
.gitmodules | 3 +++
firmware-flasher | 1 +
3 files changed, 9 insertions(+), 7 deletions(-)
create mode 100644 .gitmodules
create mode 160000 firmware-flasher
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b624ce..40dada0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,15 +34,13 @@ build-flasher:
stage: build-flasher
script:
- mkdir flasher
- - cd ..
- - git clone https://gitlab.scd31.com/cats/firmware-flasher
- - cd firmware-flasher
- - cp ../mobile-transceiver-software/firmware.bin firmware.bin
+ - cd firmware-flasher # cd into submodule
+ - cp ../firmware.bin firmware.bin
- cargo build --release --target arm-unknown-linux-gnueabihf
- cargo build --release --target x86_64-pc-windows-gnu
- - cp target/arm-unknown-linux-gnueabihf/release/stm32-firmware-flasher ../mobile-transceiver-software/flasher/flasher-linux
- - arm-linux-gnueabihf-strip ../mobile-transceiver-software/flasher/flasher-linux
- - cp target/x86_64-pc-windows-gnu/release/stm32-firmware-flasher.exe ../mobile-transceiver-software/flasher/flasher-windows.exe
+ - cp target/arm-unknown-linux-gnueabihf/release/stm32-firmware-flasher ../flasher/flasher-linux
+ - arm-linux-gnueabihf-strip ../flasher/flasher-linux
+ - cp target/x86_64-pc-windows-gnu/release/stm32-firmware-flasher.exe ../flasher/flasher-windows.exe
artifacts:
paths:
- flasher/*
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..99effa4
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "firmware-flasher"]
+ path = firmware-flasher
+ url = https://gitlab.scd31.com/cats/firmware-flasher
diff --git a/firmware-flasher b/firmware-flasher
new file mode 160000
index 0000000..87fb235
--- /dev/null
+++ b/firmware-flasher
@@ -0,0 +1 @@
+Subproject commit 87fb2352473381232e46592a75f6876a816cc171
--
GitLab