From 551807ab43c049f536beb3931ad43430a47873d8 Mon Sep 17 00:00:00 2001
From: Stephen D <webmaster@scd31.com>
Date: Sun, 12 Jan 2025 20:53:39 -0500
Subject: [PATCH 1/2] test
---
.gitlab-ci.yml | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index deead84..a12c7ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,9 +6,11 @@ stages:
- build-flasher
before_script:
- - apt update && apt install -y binutils-arm-none-eabi gcc-mingw-w64-x86-64-win32
+ - apt update && apt install -y binutils-arm-none-eabi gcc-mingw-w64-x86-64-win32 gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu
- rustup target add thumbv7em-none-eabihf
- rustup target add x86_64-pc-windows-gnu
+ - rustup target add arm-unknown-linux-musleabihf
+ - rustup target add aarch64-unknown-linux-gnu
- rustup component add rustfmt
- rustup component add clippy
- cargo install flip-link
@@ -39,9 +41,15 @@ build-flasher:
- cp ../mobile-transceiver-software/firmware.bin firmware.bin
- cargo build --release
- cargo build --release --target x86_64-pc-windows-gnu
- - cp target/release/stm32-firmware-flasher ../mobile-transceiver-software/flasher/flasher-linux
- - strip ../mobile-transceiver-software/flasher/flasher-linux
+ - cargo build --release --target aarch64-unknown-linux-gnu
+ - cargo build --release --target arm-unknown-linux-musleabihf
+ - cp target/release/stm32-firmware-flasher ../mobile-transceiver-software/flasher/flasher-x86-linux
+ - strip ../mobile-transceiver-software/flasher/flasher-x86-linux
- cp target/x86_64-pc-windows-gnu/release/stm32-firmware-flasher.exe ../mobile-transceiver-software/flasher/flasher-windows.exe
+ - cp target/aarch64-unknown-linux-gnu/stm32-firmware-flasher ../mobile-transceiver-software/flasher/flasher-pi-modern-linux
+ - aarch64-linux-strip ../mobile-transceiver-software/flasher/flasher-pi-modern-linux
+ - cp target/arm-unknown-linux-musleabihf/stm32-firmware-flasher ../mobile-transceiver-software/flasher/flasher-pi-old-linux
+ - arm-linux-eabihf-strip ../mobile-transceiver
artifacts:
paths:
- flasher/*
--
GitLab
From a3c3661037c42db627aee7ddc767ff805da1cb80 Mon Sep 17 00:00:00 2001
From: Stephen D <webmaster@scd31.com>
Date: Sun, 12 Jan 2025 21:09:46 -0500
Subject: [PATCH 2/2] fix?
---
.gitlab-ci.yml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a12c7ab..18861eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,7 @@ before_script:
- rustup component add rustfmt
- rustup component add clippy
- cargo install flip-link
+ - cargo install cross --git https://github.com/cross-rs/cross
lint:
stage: lint
@@ -41,13 +42,13 @@ build-flasher:
- cp ../mobile-transceiver-software/firmware.bin firmware.bin
- cargo build --release
- cargo build --release --target x86_64-pc-windows-gnu
- - cargo build --release --target aarch64-unknown-linux-gnu
- - cargo build --release --target arm-unknown-linux-musleabihf
+ - cross build --release --target aarch64-unknown-linux-gnu
+ - cross build --release --target arm-unknown-linux-musleabihf
- cp target/release/stm32-firmware-flasher ../mobile-transceiver-software/flasher/flasher-x86-linux
- strip ../mobile-transceiver-software/flasher/flasher-x86-linux
- cp target/x86_64-pc-windows-gnu/release/stm32-firmware-flasher.exe ../mobile-transceiver-software/flasher/flasher-windows.exe
- cp target/aarch64-unknown-linux-gnu/stm32-firmware-flasher ../mobile-transceiver-software/flasher/flasher-pi-modern-linux
- - aarch64-linux-strip ../mobile-transceiver-software/flasher/flasher-pi-modern-linux
+ - aarch64-linux-gnu-strip ../mobile-transceiver-software/flasher/flasher-pi-modern-linux
- cp target/arm-unknown-linux-musleabihf/stm32-firmware-flasher ../mobile-transceiver-software/flasher/flasher-pi-old-linux
- arm-linux-eabihf-strip ../mobile-transceiver
artifacts:
--
GitLab