From cc9e2b26d7ca7d488c254cc8a250133c5d9e7664 Mon Sep 17 00:00:00 2001 From: Brian Hilnbrand Date: Wed, 18 Jan 2023 18:29:15 -0500 Subject: [PATCH 1/9] AS-215 Add: AP version, mttr git tag, mttr git hash --- Tools/scripts/mttr-build-ci.sh | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/Tools/scripts/mttr-build-ci.sh b/Tools/scripts/mttr-build-ci.sh index dddb719e3a..5d60e578d7 100755 --- a/Tools/scripts/mttr-build-ci.sh +++ b/Tools/scripts/mttr-build-ci.sh @@ -26,8 +26,20 @@ echo $PATH ./waf configure --board=sitl --debug --enable-opendroneid ./waf copter -mv build/MttrCubeBlack/bin/arducopter.apj "/tmp/deploy_files/copter-MttrCubeBlack.apj" -mv build/MttrCubeOrange/bin/arducopter.apj "/tmp/deploy_files/copter-MttrCubeOrange.apj" -mv build/MttrCubeBlack/bin/arducopter "/tmp/deploy_files/copter-MttrCubeBlack.elf" -mv build/MttrCubeOrange/bin/arducopter "/tmp/deploy_files/copter-MttrCubeOrange.elf" +# Get Ardupilot version +eval $(sed -n 's/^#define *\([^ ]*\) *\(.*\) *$/export \1=\2/p' ArduCopter/version.h) + +# Get mttr git tag (replace all dashes with underscores) +MTTR_GIT_TAG=$(echo $(git tag --points-at HEAD --sort -version:refname | head -1) | tr - _) + +# Get mttr git hash +MTTR_GIT_HASH=$(git rev-parse --short=7 HEAD) + +# Create version string +VERSION_DESCRIPTION="ap_${FW_MAJOR}.${FW_MINOR}.${FW_PATCH}-${MTTR_GIT_TAG}-${MTTR_GIT_HASH}" + +mv build/MttrCubeBlack/bin/arducopter.apj "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeBlack.apj" +mv build/MttrCubeOrange/bin/arducopter.apj "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeOrange.apj" +mv build/MttrCubeBlack/bin/arducopter "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeBlack.elf" +mv build/MttrCubeOrange/bin/arducopter "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeOrange.elf" mv build/sitl/bin/arducopter "/tmp/deploy_files/sitl.elf" From f4395bc2fb8e36caa6e4d899e2db923856fe1d53 Mon Sep 17 00:00:00 2001 From: Brian Hilnbrand Date: Wed, 18 Jan 2023 18:45:50 -0500 Subject: [PATCH 2/9] AS-215 Fix: get latest mttr-* git tag in branch history --- Tools/scripts/mttr-build-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/scripts/mttr-build-ci.sh b/Tools/scripts/mttr-build-ci.sh index 5d60e578d7..39311e852c 100755 --- a/Tools/scripts/mttr-build-ci.sh +++ b/Tools/scripts/mttr-build-ci.sh @@ -30,7 +30,7 @@ echo $PATH eval $(sed -n 's/^#define *\([^ ]*\) *\(.*\) *$/export \1=\2/p' ArduCopter/version.h) # Get mttr git tag (replace all dashes with underscores) -MTTR_GIT_TAG=$(echo $(git tag --points-at HEAD --sort -version:refname | head -1) | tr - _) +MTTR_GIT_TAG=$(echo $(git tag -l "mttr-*" --sort=-committerdate | head -1) | tr - _) # Get mttr git hash MTTR_GIT_HASH=$(git rev-parse --short=7 HEAD) From 93128f49364a83b3714fc1772926a16047d6d860 Mon Sep 17 00:00:00 2001 From: Brian Hilnbrand Date: Wed, 18 Jan 2023 18:48:14 -0500 Subject: [PATCH 3/9] AS-215 Fix: only look at branch history for latest tag --- Tools/scripts/mttr-build-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/scripts/mttr-build-ci.sh b/Tools/scripts/mttr-build-ci.sh index 39311e852c..d1da753004 100755 --- a/Tools/scripts/mttr-build-ci.sh +++ b/Tools/scripts/mttr-build-ci.sh @@ -30,7 +30,7 @@ echo $PATH eval $(sed -n 's/^#define *\([^ ]*\) *\(.*\) *$/export \1=\2/p' ArduCopter/version.h) # Get mttr git tag (replace all dashes with underscores) -MTTR_GIT_TAG=$(echo $(git tag -l "mttr-*" --sort=-committerdate | head -1) | tr - _) +MTTR_GIT_TAG=$(echo $(git describe --tags --abbrev=0) | tr - _) # Get mttr git hash MTTR_GIT_HASH=$(git rev-parse --short=7 HEAD) From 76503a1ba51fab3887f9dc64320331931e5af664 Mon Sep 17 00:00:00 2001 From: Brian Hilnbrand Date: Wed, 18 Jan 2023 19:12:23 -0500 Subject: [PATCH 4/9] AS-215 Add: fetch tags before query --- Tools/scripts/mttr-build-ci.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Tools/scripts/mttr-build-ci.sh b/Tools/scripts/mttr-build-ci.sh index d1da753004..feb3a4ccd7 100755 --- a/Tools/scripts/mttr-build-ci.sh +++ b/Tools/scripts/mttr-build-ci.sh @@ -30,6 +30,7 @@ echo $PATH eval $(sed -n 's/^#define *\([^ ]*\) *\(.*\) *$/export \1=\2/p' ArduCopter/version.h) # Get mttr git tag (replace all dashes with underscores) +git fetch -t MTTR_GIT_TAG=$(echo $(git describe --tags --abbrev=0) | tr - _) # Get mttr git hash From e2ebbc2d3f6853504c51ac99cf6d9bf1491e9335 Mon Sep 17 00:00:00 2001 From: Brian Hilnbrand Date: Wed, 18 Jan 2023 19:28:26 -0500 Subject: [PATCH 5/9] AS-215 Fix: git fetch don't recurse submodules --- Tools/scripts/mttr-build-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/scripts/mttr-build-ci.sh b/Tools/scripts/mttr-build-ci.sh index feb3a4ccd7..0004c970e5 100755 --- a/Tools/scripts/mttr-build-ci.sh +++ b/Tools/scripts/mttr-build-ci.sh @@ -30,7 +30,7 @@ echo $PATH eval $(sed -n 's/^#define *\([^ ]*\) *\(.*\) *$/export \1=\2/p' ArduCopter/version.h) # Get mttr git tag (replace all dashes with underscores) -git fetch -t +git fetch --tags --no-recurse-submodules MTTR_GIT_TAG=$(echo $(git describe --tags --abbrev=0) | tr - _) # Get mttr git hash From e37637f2b1f6e26f734a69a52fdd77133af2e221 Mon Sep 17 00:00:00 2001 From: Brian Hilnbrand Date: Wed, 18 Jan 2023 20:36:04 -0500 Subject: [PATCH 6/9] AS-215 Update: different approach to getting latest tag --- Tools/scripts/mttr-build-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/scripts/mttr-build-ci.sh b/Tools/scripts/mttr-build-ci.sh index 0004c970e5..e9f18f84a1 100755 --- a/Tools/scripts/mttr-build-ci.sh +++ b/Tools/scripts/mttr-build-ci.sh @@ -31,7 +31,7 @@ eval $(sed -n 's/^#define *\([^ ]*\) *\(.*\) *$/export \1=\2/p' ArduCopter/ver # Get mttr git tag (replace all dashes with underscores) git fetch --tags --no-recurse-submodules -MTTR_GIT_TAG=$(echo $(git describe --tags --abbrev=0) | tr - _) +MTTR_GIT_TAG=$(echo $(git tag -l "mttr-*" --sort=-committerdate | head -1) | tr - _) # Get mttr git hash MTTR_GIT_HASH=$(git rev-parse --short=7 HEAD) From 3272b4b7b6488c78db5b14871c0d21b48bb14195 Mon Sep 17 00:00:00 2001 From: Brian Hilnbrand Date: Wed, 18 Jan 2023 20:38:18 -0500 Subject: [PATCH 7/9] AS-215 Debug: only run tag code --- Tools/scripts/mttr-build-ci.sh | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Tools/scripts/mttr-build-ci.sh b/Tools/scripts/mttr-build-ci.sh index e9f18f84a1..8b2a099962 100755 --- a/Tools/scripts/mttr-build-ci.sh +++ b/Tools/scripts/mttr-build-ci.sh @@ -10,21 +10,21 @@ mv apm.pdef.xml "/tmp/deploy_files" unset CXX CC -wget https://firmware.ardupilot.org/Tools/STM32-tools/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 -tar xjf gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 -export PATH=$PATH:$PWD/gcc-arm-none-eabi-6-2017-q2-update/bin -echo $PATH +# wget https://firmware.ardupilot.org/Tools/STM32-tools/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 +# tar xjf gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 +# export PATH=$PATH:$PWD/gcc-arm-none-eabi-6-2017-q2-update/bin +# echo $PATH -./waf distclean +# ./waf distclean -./waf configure --board=MttrCubeBlack --enable-opendroneid -./waf copter +# ./waf configure --board=MttrCubeBlack --enable-opendroneid +# ./waf copter -./waf configure --board=MttrCubeOrange --enable-opendroneid -./waf copter +# ./waf configure --board=MttrCubeOrange --enable-opendroneid +# ./waf copter -./waf configure --board=sitl --debug --enable-opendroneid -./waf copter +# ./waf configure --board=sitl --debug --enable-opendroneid +# ./waf copter # Get Ardupilot version eval $(sed -n 's/^#define *\([^ ]*\) *\(.*\) *$/export \1=\2/p' ArduCopter/version.h) @@ -39,8 +39,8 @@ MTTR_GIT_HASH=$(git rev-parse --short=7 HEAD) # Create version string VERSION_DESCRIPTION="ap_${FW_MAJOR}.${FW_MINOR}.${FW_PATCH}-${MTTR_GIT_TAG}-${MTTR_GIT_HASH}" -mv build/MttrCubeBlack/bin/arducopter.apj "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeBlack.apj" -mv build/MttrCubeOrange/bin/arducopter.apj "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeOrange.apj" -mv build/MttrCubeBlack/bin/arducopter "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeBlack.elf" -mv build/MttrCubeOrange/bin/arducopter "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeOrange.elf" -mv build/sitl/bin/arducopter "/tmp/deploy_files/sitl.elf" +# mv build/MttrCubeBlack/bin/arducopter.apj "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeBlack.apj" +# mv build/MttrCubeOrange/bin/arducopter.apj "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeOrange.apj" +# mv build/MttrCubeBlack/bin/arducopter "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeBlack.elf" +# mv build/MttrCubeOrange/bin/arducopter "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeOrange.elf" +# mv build/sitl/bin/arducopter "/tmp/deploy_files/sitl.elf" From 87023a5abf6ca86439ef283a6806da125961c5c8 Mon Sep 17 00:00:00 2001 From: Brian Hilnbrand Date: Wed, 18 Jan 2023 20:54:03 -0500 Subject: [PATCH 8/9] Revert "AS-215 Debug: only run tag code" This reverts commit 3272b4b7b6488c78db5b14871c0d21b48bb14195. --- Tools/scripts/mttr-build-ci.sh | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Tools/scripts/mttr-build-ci.sh b/Tools/scripts/mttr-build-ci.sh index 8b2a099962..e9f18f84a1 100755 --- a/Tools/scripts/mttr-build-ci.sh +++ b/Tools/scripts/mttr-build-ci.sh @@ -10,21 +10,21 @@ mv apm.pdef.xml "/tmp/deploy_files" unset CXX CC -# wget https://firmware.ardupilot.org/Tools/STM32-tools/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 -# tar xjf gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 -# export PATH=$PATH:$PWD/gcc-arm-none-eabi-6-2017-q2-update/bin -# echo $PATH +wget https://firmware.ardupilot.org/Tools/STM32-tools/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 +tar xjf gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 +export PATH=$PATH:$PWD/gcc-arm-none-eabi-6-2017-q2-update/bin +echo $PATH -# ./waf distclean +./waf distclean -# ./waf configure --board=MttrCubeBlack --enable-opendroneid -# ./waf copter +./waf configure --board=MttrCubeBlack --enable-opendroneid +./waf copter -# ./waf configure --board=MttrCubeOrange --enable-opendroneid -# ./waf copter +./waf configure --board=MttrCubeOrange --enable-opendroneid +./waf copter -# ./waf configure --board=sitl --debug --enable-opendroneid -# ./waf copter +./waf configure --board=sitl --debug --enable-opendroneid +./waf copter # Get Ardupilot version eval $(sed -n 's/^#define *\([^ ]*\) *\(.*\) *$/export \1=\2/p' ArduCopter/version.h) @@ -39,8 +39,8 @@ MTTR_GIT_HASH=$(git rev-parse --short=7 HEAD) # Create version string VERSION_DESCRIPTION="ap_${FW_MAJOR}.${FW_MINOR}.${FW_PATCH}-${MTTR_GIT_TAG}-${MTTR_GIT_HASH}" -# mv build/MttrCubeBlack/bin/arducopter.apj "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeBlack.apj" -# mv build/MttrCubeOrange/bin/arducopter.apj "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeOrange.apj" -# mv build/MttrCubeBlack/bin/arducopter "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeBlack.elf" -# mv build/MttrCubeOrange/bin/arducopter "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeOrange.elf" -# mv build/sitl/bin/arducopter "/tmp/deploy_files/sitl.elf" +mv build/MttrCubeBlack/bin/arducopter.apj "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeBlack.apj" +mv build/MttrCubeOrange/bin/arducopter.apj "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeOrange.apj" +mv build/MttrCubeBlack/bin/arducopter "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeBlack.elf" +mv build/MttrCubeOrange/bin/arducopter "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeOrange.elf" +mv build/sitl/bin/arducopter "/tmp/deploy_files/sitl.elf" From c2c1ebd12c57d9a732de535e6552e840762b3842 Mon Sep 17 00:00:00 2001 From: Brian Hilnbrand Date: Wed, 25 Jan 2023 10:17:07 -0800 Subject: [PATCH 9/9] AS-215 Remove: don't run github actions on PR github actions already runs on push using the correct commit hash. This covers push, PR, and merges. --- .github/workflows/test_sitl_copter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_sitl_copter.yml b/.github/workflows/test_sitl_copter.yml index e4328d7803..663796b6be 100644 --- a/.github/workflows/test_sitl_copter.yml +++ b/.github/workflows/test_sitl_copter.yml @@ -1,6 +1,6 @@ name: test copter -on: [push, pull_request, workflow_dispatch] +on: [push, workflow_dispatch] # paths: # - "*" # - "!README.md" <-- don't rebuild on doc change