Skip to content

AS-215 version in build artifact file name #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bhiln wants to merge 9 commits into
base: mttr-rebase-4.0
Choose a base branch
from
Open

AS-215 version in build artifact file name #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cc9e2b2
AS-215 Add: AP version, mttr git tag, mttr git hash
bhiln Jan 18, 2023
f4395bc
AS-215 Fix: get latest mttr-* git tag in branch history
bhiln Jan 18, 2023
93128f4
AS-215 Fix: only look at branch history for latest tag
bhiln Jan 18, 2023
76503a1
AS-215 Add: fetch tags before query
bhiln Jan 19, 2023
e2ebbc2
AS-215 Fix: git fetch don't recurse submodules
bhiln Jan 19, 2023
e37637f
AS-215 Update: different approach to getting latest tag
bhiln Jan 19, 2023
3272b4b
AS-215 Debug: only run tag code
bhiln Jan 19, 2023
87023a5
Revert "AS-215 Debug: only run tag code"
bhiln Jan 19, 2023
c2c1ebd
AS-215 Remove: don't run github actions on PR
bhiln Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test_sitl_copter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
21 changes: 17 additions & 4 deletions Tools/scripts/mttr-build-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,21 @@ 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)
git fetch --tags --no-recurse-submodules
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)
Copy link
Contributor

@robkarol robkarol Jan 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When this gets run is very important. It must be run after the commit gets merged to the main for this to work. If you can run a test that shows the hash is correct we can leave this in. Otherwise it will cause way more confusion than its worth.

Copy link
Contributor Author

@bhiln bhiln Jan 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right. I ensured that it worked well on my pc, but I'm not sure it was right from circleci. I'm looking into this.

Copy link
Contributor Author

@bhiln bhiln Jan 25, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@robkarol Here's the latest push with correct hash in the files: https://github.com/matternet/ardupilot/actions/runs/4008770308
image
image


# 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"