From 268ab917ba4199c1dda63c3289d0581c99006d26 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Sat, 9 May 2020 06:17:44 -0700 Subject: [PATCH 01/25] package now using ROS perception AM-295 master --- .github/workflows/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index bd1bb92e..8a29c9ca 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v2 - name: Package id: package - uses: AutoModality/action-package-debian-ros@v3-perception + uses: AutoModality/action-package-debian-ros@v3.2.0 with: branch: ${{ github.event.pull_request.head.ref }} build-number: ${{ github.run_number }} From 4c82bb317323975787a8e161d8a923c6326371fe Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Sun, 10 May 2020 06:49:10 -0700 Subject: [PATCH 02/25] ci: adding branch back into RC version master --- .github/workflows/package.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 8a29c9ca..9ddb48bc 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -13,11 +13,12 @@ jobs: steps: - uses: AutoModality/action-clean@v1.1.0 - uses: actions/checkout@v2 + - uses: rlespinasse/github-slug-action@2.0.0 # for GITHUB_REF_SLUG - name: Package id: package uses: AutoModality/action-package-debian-ros@v3.2.0 with: - branch: ${{ github.event.pull_request.head.ref }} + branch: ${{ env.GITHUB_REF_SLUG }} build-number: ${{ github.run_number }} release-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_RELEASE_ENTITLEMENT }} - name: The generated package From ba375462288db216527392cd4e957ea1ab685631 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Sun, 10 May 2020 07:37:06 -0700 Subject: [PATCH 03/25] docs: updating readme master --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9d5e109f..a33208b4 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,5 @@ Watches the health of all nodes to determine if the flight shall continue.. -[![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/badges/version/automodality/release/deb/ros-melodic-am-super/latest/d=ubuntu%252Fbionic;t=1/?render=true&badge_token=gAAAAABetY4e0kXP_ZlIdblJEZG8GiEIYJRkjvt9-nVmp3U4QiqyH-2mOfwi_B7meqOAh3rgt-lbVvFTiAmsysp4iMNx79oZfuVCEac-Lqz-dXxW4W7AbYU%3D)](https://cloudsmith.io/~automodality/repos/release/packages/detail/deb/ros-melodic-am-super/latest/d=ubuntu%252Fbionic;t=1/) ![Release](https://github.com/AutoModality/am_super/workflows/Release/badge.svg) \ No newline at end of file +![Release](https://github.com/AutoModality/am_super/workflows/Release/badge.svg) +[![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/badges/version/automodality/release/deb/ros-melodic-am-super/latest/d=ubuntu%252Fbionic;t=1/?render=true&badge_token=gAAAAABetY4e0kXP_ZlIdblJEZG8GiEIYJRkjvt9-nVmp3U4QiqyH-2mOfwi_B7meqOAh3rgt-lbVvFTiAmsysp4iMNx79oZfuVCEac-Lqz-dXxW4W7AbYU%3D)](https://cloudsmith.io/~automodality/repos/release/packages/detail/deb/ros-melodic-am-super/latest/d=ubuntu%252Fbionic;t=1/) \ No newline at end of file From fc3e56f7fc7fc33915e482c4d7c92c73fb165df6 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Sun, 17 May 2020 16:22:49 -0700 Subject: [PATCH 04/25] ci: avoid building on the drone AM-284 master --- .github/workflows/nightly.yml | 2 +- .github/workflows/package.yml | 2 +- .github/workflows/release.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 8f5c1e34..7e5b3afb 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v1 - name: Package id: package - uses: AutoModality/action-package-debian-ros@v3-perception + uses: AutoModality/action-package-debian-ros@3.2.0 with: release-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_RELEASE_ENTITLEMENT }} diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 9ddb48bc..6904d274 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -8,7 +8,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [[x64, self-hosted,linux], [arm64,self-hosted,linux]] + os: [[x64, self-hosted,linux,build], [arm64,self-hosted,linux, build]] fail-fast: false steps: - uses: AutoModality/action-clean@v1.1.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 516d18b0..db36d1c2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [[x64,self-hosted,linux]] + os: [[x64, self-hosted,linux,build]] steps: - uses: AutoModality/action-clean@v1.1.0 - name: Checkout @@ -52,7 +52,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [[x64,self-hosted,linux], [arm64,self-hosted,linux]] + os: [[x64, self-hosted,linux,build], [arm64,self-hosted,linux, build]] fail-fast: true name: Package if released steps: From 5e06e186164bf2e984bca15868bb071de2fc2570 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Sun, 17 May 2020 17:44:21 -0700 Subject: [PATCH 05/25] ci: using latest package action master --- .github/workflows/package.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 6904d274..9f2f16f4 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -16,7 +16,7 @@ jobs: - uses: rlespinasse/github-slug-action@2.0.0 # for GITHUB_REF_SLUG - name: Package id: package - uses: AutoModality/action-package-debian-ros@v3.2.0 + uses: AutoModality/action-package-debian-ros@v3 with: branch: ${{ env.GITHUB_REF_SLUG }} build-number: ${{ github.run_number }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index db36d1c2..50ec973b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -80,7 +80,7 @@ jobs: - name: Package if published if: steps.published.outputs.value == 'true' id: package - uses: AutoModality/action-package-debian-ros@v3.2.0 + uses: AutoModality/action-package-debian-ros@v3 with: version: ${{ steps.version.outputs.value }} release-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_RELEASE_ENTITLEMENT }} From 46438ffef7c0491191783d32c7fb7808ed9856bb Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Sun, 24 May 2020 07:31:52 -0700 Subject: [PATCH 06/25] ci: fixed nightly syntax error master --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 7e5b3afb..e06ffd1c 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v1 - name: Package id: package - uses: AutoModality/action-package-debian-ros@3.2.0 + uses: AutoModality/action-package-debian-ros@v3.2.0 with: release-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_RELEASE_ENTITLEMENT }} From 5a32fdecd0cf3d2ec64b0c63d5c8e8e9e7ae627e Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Wed, 3 Jun 2020 17:59:40 -0700 Subject: [PATCH 07/25] ci: fixed nightly package version master --- .github/workflows/nightly.yml | 2 +- .gitignore | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index e06ffd1c..39e0b231 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v1 - name: Package id: package - uses: AutoModality/action-package-debian-ros@v3.2.0 + uses: AutoModality/action-package-debian-ros@v3 with: release-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_RELEASE_ENTITLEMENT }} diff --git a/.gitignore b/.gitignore index 03a657f6..86dd5855 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,5 @@ debian/ros-* debian/*-stamp debian/source ros-melodic-am-super-*.deb -debian/.debhelper/* \ No newline at end of file +debian/.debhelper/* +.history \ No newline at end of file From 2659060e58f43422fd4d65d76997270f4e4cabfa Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Thu, 4 Jun 2020 08:06:56 -0700 Subject: [PATCH 08/25] test: added sample tests to demonstrate build failure PL-629/tests --- .gitignore | 3 ++- CMakeLists.txt | 11 ++++------- debian/changelog | 6 +----- package.xml | 9 +++------ test/sample_tests.cpp | 22 ++++++++++++++++++++++ 5 files changed, 32 insertions(+), 19 deletions(-) create mode 100644 test/sample_tests.cpp diff --git a/.gitignore b/.gitignore index 86dd5855..c8d305e8 100644 --- a/.gitignore +++ b/.gitignore @@ -37,4 +37,5 @@ debian/*-stamp debian/source ros-melodic-am-super-*.deb debian/.debhelper/* -.history \ No newline at end of file +.history +build \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index c26e4349..afa4397f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -169,10 +169,7 @@ install(DIRECTORY include/super_lib ############# ## Add gtest based cpp test target and link libraries -# catkin_add_gtest(${PROJECT_NAME}-test test/test_machine_learning.cpp) -# if(TARGET ${PROJECT_NAME}-test) -# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME}) -# endif() - -## Add folders to be run by python nosetests -# catkin_add_nosetests(test) +catkin_add_gtest(${PROJECT_NAME}_test test/sample_tests.cpp) +if(TARGET ${PROJECT_NAME}_test) + target_link_libraries(${PROJECT_NAME}_test ${catkin_LIBRARIES}) +endif() diff --git a/debian/changelog b/debian/changelog index 2393ec7d..a964bd19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1 @@ -ros-melodic-am-super (999.99.9) unstable; urgency=medium - - * First - --- Debian Template Sat, 08 Feb 2020 00:36:37 -0800 +ros-melodic-am-super (0.20200604145726) unstable; urgency=medium diff --git a/package.xml b/package.xml index 39fa44c9..f258c661 100644 --- a/package.xml +++ b/package.xml @@ -3,11 +3,7 @@ am_super 0.0.0 AutoModality Supervisor - - - - - support + AutoModality @@ -24,5 +20,6 @@ rospy std_msgs std_srvs - + rosunit + diff --git a/test/sample_tests.cpp b/test/sample_tests.cpp new file mode 100644 index 00000000..ddf8a1d1 --- /dev/null +++ b/test/sample_tests.cpp @@ -0,0 +1,22 @@ +#include // googletest header file + +#include +using std::string; + +const char *actualValTrue = "hello gtest"; +const char *actualValFalse = "hello world"; +const char *expectVal = "hello gtest"; + +TEST(StrCompare, CStrEqual) { + EXPECT_STREQ(expectVal, actualValTrue); +} + +TEST(StrCompare, CStrNotEqual) { + EXPECT_STREQ(expectVal, actualValFalse); +} + + +int main(int argc, char **argv) { + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} \ No newline at end of file From 2bbfc97a6786039cc0232b348edc925fc1ad866e Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Thu, 4 Jun 2020 08:43:27 -0700 Subject: [PATCH 09/25] DJI SDK residue removed AM-334 AM-337/gtest --- .gitignore | 3 ++- CMakeLists.txt | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c8d305e8..cab87390 100644 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,5 @@ debian/source ros-melodic-am-super-*.deb debian/.debhelper/* .history -build \ No newline at end of file +build +.catkin_tools diff --git a/CMakeLists.txt b/CMakeLists.txt index afa4397f..6a6c4de7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,6 @@ endif(CUDA_FOUND) ## System dependencies are found with CMake's conventions -find_package(DJIOSDK REQUIRED) ## Uncomment this if the package has a setup.py. This macro ensures @@ -119,10 +118,10 @@ add_dependencies(super_lib ${catkin_EXPORTED_TARGETS}) if(CUDA_FOUND) add_executable(am_super src/am_super/am_super.cpp src/cuda/cuda_utility_class.cpp) - target_link_libraries(am_super ${catkin_LIBRARIES} ${DJIOSDK_LIBRARIES} super_lib cuda_utility) + target_link_libraries(am_super ${catkin_LIBRARIES} super_lib cuda_utility) else() add_executable(am_super src/am_super/am_super.cpp) - target_link_libraries(am_super ${catkin_LIBRARIES} ${DJIOSDK_LIBRARIES} super_lib) + target_link_libraries(am_super ${catkin_LIBRARIES} super_lib) endif(CUDA_FOUND) add_dependencies(am_super ${catkin_EXPORTED_TARGETS}) From 1e1a04a6c78c36deee7fbbd8400ae43f9a3d4167 Mon Sep 17 00:00:00 2001 From: Format Bot Date: Thu, 4 Jun 2020 15:49:11 +0000 Subject: [PATCH 10/25] style: Applied ROS C++ Style Guide --- test/sample_tests.cpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/test/sample_tests.cpp b/test/sample_tests.cpp index ddf8a1d1..3897667d 100644 --- a/test/sample_tests.cpp +++ b/test/sample_tests.cpp @@ -1,22 +1,24 @@ -#include // googletest header file +#include // googletest header file #include using std::string; -const char *actualValTrue = "hello gtest"; -const char *actualValFalse = "hello world"; -const char *expectVal = "hello gtest"; +const char* actualValTrue = "hello gtest"; +const char* actualValFalse = "hello world"; +const char* expectVal = "hello gtest"; -TEST(StrCompare, CStrEqual) { - EXPECT_STREQ(expectVal, actualValTrue); +TEST(StrCompare, CStrEqual) +{ + EXPECT_STREQ(expectVal, actualValTrue); } -TEST(StrCompare, CStrNotEqual) { - EXPECT_STREQ(expectVal, actualValFalse); +TEST(StrCompare, CStrNotEqual) +{ + EXPECT_STREQ(expectVal, actualValFalse); } - -int main(int argc, char **argv) { - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); +int main(int argc, char** argv) +{ + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); } \ No newline at end of file From 8c0c914096622d72ea2b3acc5b4e110fee216edf Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Thu, 4 Jun 2020 18:24:49 -0700 Subject: [PATCH 11/25] ci: run tests with build AM-337/gtest --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 07e42d3f..c36cf4ac 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,8 @@ SHELL := /bin/bash default: - source /opt/ros/melodic/setup.bash && cd catkin_ws && catkin build -j3 --no-status + source /opt/ros/melodic/setup.bash && cd catkin_ws && catkin build -j3 --no-status --catkin-make-args run_tests + rm -f catkin_ws/install/lib/pkgconfig/catkin_tools_prebuild.pc From d5a88d3fd6a988ec239c299dbb95ca8ad73e3f9e Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Thu, 4 Jun 2020 18:25:08 -0700 Subject: [PATCH 12/25] test: adding more sample tests AM-337/gtest --- test/sample_tests.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/sample_tests.cpp b/test/sample_tests.cpp index ddf8a1d1..23835f38 100644 --- a/test/sample_tests.cpp +++ b/test/sample_tests.cpp @@ -11,10 +11,22 @@ TEST(StrCompare, CStrEqual) { EXPECT_STREQ(expectVal, actualValTrue); } +TEST(StrCompare, CStrEqual2) { + EXPECT_STREQ(expectVal, actualValTrue); +} + +TEST(StrCompare, CStrEqual3) { + EXPECT_STREQ(expectVal, actualValTrue); +} + TEST(StrCompare, CStrNotEqual) { EXPECT_STREQ(expectVal, actualValFalse); } +TEST(StrCompare, CStrNotEqual4) { + EXPECT_STREQ(expectVal, actualValFalse); +} + int main(int argc, char **argv) { ::testing::InitGoogleTest(&argc, argv); From f08ab9aa7ef2c5b4a99bb786cb1cbacdb8a0044f Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Thu, 4 Jun 2020 18:25:20 -0700 Subject: [PATCH 13/25] ci: generating test report AM-337/gtest --- .github/workflows/package.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 9f2f16f4..f1e4e64b 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -35,6 +35,18 @@ jobs: distro: 'ubuntu' release: 'bionic' file: '${{ steps.package.outputs.artifact-path }}' + - name: Generate Test Reports + if: always() + id: xunit-viewer + uses: AutoModality/action-xunit-viewer@v1.0.1 + with: + results: catkin_ws/build/am_super/test_results/am_super + - name: Attach Test Reports + if: always() + uses: actions/upload-artifact@v1 + with: + name: ${{ env.GITHUB_REPOSITORY_SLUG_URL }}-${{ github.run_number }}-test-reports + path: ${{ steps.xunit-viewer.outputs.report-dir }} draft-pr: runs-on: ubuntu-18.04 needs: package From 9054cf83266015ea961bc9b9ab08d0b49523c55e Mon Sep 17 00:00:00 2001 From: Format Bot Date: Fri, 5 Jun 2020 01:32:07 +0000 Subject: [PATCH 14/25] style: Applied ROS C++ Style Guide --- test/sample_tests.cpp | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/test/sample_tests.cpp b/test/sample_tests.cpp index 3a59d9f3..c4afa4eb 100644 --- a/test/sample_tests.cpp +++ b/test/sample_tests.cpp @@ -12,24 +12,28 @@ TEST(StrCompare, CStrEqual) EXPECT_STREQ(expectVal, actualValTrue); } -TEST(StrCompare, CStrEqual2) { - EXPECT_STREQ(expectVal, actualValTrue); +TEST(StrCompare, CStrEqual2) +{ + EXPECT_STREQ(expectVal, actualValTrue); } -TEST(StrCompare, CStrEqual3) { - EXPECT_STREQ(expectVal, actualValTrue); +TEST(StrCompare, CStrEqual3) +{ + EXPECT_STREQ(expectVal, actualValTrue); } -TEST(StrCompare, CStrNotEqual) { - EXPECT_STREQ(expectVal, actualValFalse); +TEST(StrCompare, CStrNotEqual) +{ + EXPECT_STREQ(expectVal, actualValFalse); } -TEST(StrCompare, CStrNotEqual4) { - EXPECT_STREQ(expectVal, actualValFalse); +TEST(StrCompare, CStrNotEqual4) +{ + EXPECT_STREQ(expectVal, actualValFalse); } - -int main(int argc, char **argv) { - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); +int main(int argc, char** argv) +{ + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); } \ No newline at end of file From c1f7b287909410f0d581d376a75dce7df19cd904 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Thu, 4 Jun 2020 18:52:18 -0700 Subject: [PATCH 15/25] ci: generic test results dir AM-337/gtest --- .github/workflows/package.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index f1e4e64b..e72f7212 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -35,12 +35,14 @@ jobs: distro: 'ubuntu' release: 'bionic' file: '${{ steps.package.outputs.artifact-path }}' + - name: Repo Name + run: echo ::set-env name=REPOSITORY_NAME::$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//") - name: Generate Test Reports if: always() id: xunit-viewer uses: AutoModality/action-xunit-viewer@v1.0.1 with: - results: catkin_ws/build/am_super/test_results/am_super + results: catkin_ws/build/${env.REPOSITORY_NAME}/test_results/${env.REPOSITORY_NAME} - name: Attach Test Reports if: always() uses: actions/upload-artifact@v1 From c32a355af796a87be228de32b3d88885c8c824e2 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Thu, 4 Jun 2020 18:55:37 -0700 Subject: [PATCH 16/25] ci: workflow syntax AM-337/gtest --- .github/workflows/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index e72f7212..a2fc3a19 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -42,7 +42,7 @@ jobs: id: xunit-viewer uses: AutoModality/action-xunit-viewer@v1.0.1 with: - results: catkin_ws/build/${env.REPOSITORY_NAME}/test_results/${env.REPOSITORY_NAME} + results: catkin_ws/build/${{env.REPOSITORY_NAME}}/test_results/${{env.REPOSITORY_NAME}} - name: Attach Test Reports if: always() uses: actions/upload-artifact@v1 From a5926e13eaa118ab9770b5acb69ac86560988e68 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Fri, 5 Jun 2020 10:31:48 -0700 Subject: [PATCH 17/25] ci: reporting failed tests AM-337/gtest --- .github/workflows/package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index a2fc3a19..7f18d357 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -40,14 +40,14 @@ jobs: - name: Generate Test Reports if: always() id: xunit-viewer - uses: AutoModality/action-xunit-viewer@v1.0.1 + uses: AutoModality/action-xunit-viewer@AM-337/gtest with: results: catkin_ws/build/${{env.REPOSITORY_NAME}}/test_results/${{env.REPOSITORY_NAME}} - name: Attach Test Reports if: always() uses: actions/upload-artifact@v1 with: - name: ${{ env.GITHUB_REPOSITORY_SLUG_URL }}-${{ github.run_number }}-test-reports + name: ${{ steps.xunit-viewer.outputs.report-name }} path: ${{ steps.xunit-viewer.outputs.report-dir }} draft-pr: runs-on: ubuntu-18.04 From 4abd9d9bf7ffddf65fc519525714fce513733426 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Fri, 5 Jun 2020 10:41:02 -0700 Subject: [PATCH 18/25] docs: updated ci badge AM-337/gtest --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a33208b4..75f32803 100644 --- a/README.md +++ b/README.md @@ -2,5 +2,5 @@ Watches the health of all nodes to determine if the flight shall continue.. -![Release](https://github.com/AutoModality/am_super/workflows/Release/badge.svg) +[![Release](https://github.com/AutoModality/am_super/workflows/Release/badge.svg)](https://github.com/AutoModality/am_super/workflows/Release/badge.svg) [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/badges/version/automodality/release/deb/ros-melodic-am-super/latest/d=ubuntu%252Fbionic;t=1/?render=true&badge_token=gAAAAABetY4e0kXP_ZlIdblJEZG8GiEIYJRkjvt9-nVmp3U4QiqyH-2mOfwi_B7meqOAh3rgt-lbVvFTiAmsysp4iMNx79oZfuVCEac-Lqz-dXxW4W7AbYU%3D)](https://cloudsmith.io/~automodality/repos/release/packages/detail/deb/ros-melodic-am-super/latest/d=ubuntu%252Fbionic;t=1/) \ No newline at end of file From 60b3ea75e1788459930906b0a8b38c1413605c1d Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Fri, 5 Jun 2020 11:11:05 -0700 Subject: [PATCH 19/25] ci: added publish to azure AM-337/gtest --- .github/workflows/package.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 7f18d357..bb032818 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -49,6 +49,16 @@ jobs: with: name: ${{ steps.xunit-viewer.outputs.report-name }} path: ${{ steps.xunit-viewer.outputs.report-dir }} + - name: Publish Tests to Azure Storage + uses: bacongobbler/azure-blob-storage-upload@v1.0.0 + with: + source_dir: ${{ steps.xunit-viewer.outputs.report-dir }} + container_name: docs + # http://tiny.cc/y1bznz + connection_string: ${{ secrets.AMROSDOC_AZURE_STORAGE_CONNECTION_STRING }} + extra_args: --destination-path ${{github.repository}}/test-reports + sync: true + draft-pr: runs-on: ubuntu-18.04 needs: package From cbeabb7ab83c95990754a52ddebb0d6191f08dad Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Fri, 5 Jun 2020 11:13:18 -0700 Subject: [PATCH 20/25] ci: always publishing to azure storage AM-337/gtest --- .github/workflows/package.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index bb032818..b6f8f661 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -49,7 +49,8 @@ jobs: with: name: ${{ steps.xunit-viewer.outputs.report-name }} path: ${{ steps.xunit-viewer.outputs.report-dir }} - - name: Publish Tests to Azure Storage + - name: Publish Test Reports to Azure Storage + if: always() uses: bacongobbler/azure-blob-storage-upload@v1.0.0 with: source_dir: ${{ steps.xunit-viewer.outputs.report-dir }} From ea86c68aa0c6adc1aae49e7dc468751999ef875a Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Fri, 5 Jun 2020 13:12:40 -0700 Subject: [PATCH 21/25] ci: added test to release publishing to azure only in release AM-337/gtest --- .github/workflows/package.yml | 12 +----------- .github/workflows/release.yml | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index b6f8f661..9e693ea1 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -40,7 +40,7 @@ jobs: - name: Generate Test Reports if: always() id: xunit-viewer - uses: AutoModality/action-xunit-viewer@AM-337/gtest + uses: AutoModality/action-xunit-viewer@v1 with: results: catkin_ws/build/${{env.REPOSITORY_NAME}}/test_results/${{env.REPOSITORY_NAME}} - name: Attach Test Reports @@ -49,16 +49,6 @@ jobs: with: name: ${{ steps.xunit-viewer.outputs.report-name }} path: ${{ steps.xunit-viewer.outputs.report-dir }} - - name: Publish Test Reports to Azure Storage - if: always() - uses: bacongobbler/azure-blob-storage-upload@v1.0.0 - with: - source_dir: ${{ steps.xunit-viewer.outputs.report-dir }} - container_name: docs - # http://tiny.cc/y1bznz - connection_string: ${{ secrets.AMROSDOC_AZURE_STORAGE_CONNECTION_STRING }} - extra_args: --destination-path ${{github.repository}}/test-reports - sync: true draft-pr: runs-on: ubuntu-18.04 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 50ec973b..0ac254be 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -84,6 +84,31 @@ jobs: with: version: ${{ steps.version.outputs.value }} release-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_RELEASE_ENTITLEMENT }} + - name: Repo Name + if: steps.published.outputs.value == 'true' + run: echo ::set-env name=REPOSITORY_NAME::$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//") + - name: Generate Test Reports + if: steps.published.outputs.value == 'true' + id: xunit-viewer + uses: AutoModality/action-xunit-viewer@v1 + with: + results: catkin_ws/build/${{env.REPOSITORY_NAME}}/test_results/${{env.REPOSITORY_NAME}} + - name: Attach Test Reports + if: always() + uses: actions/upload-artifact@v1 + with: + name: ${{ steps.xunit-viewer.outputs.report-name }} + path: ${{ steps.xunit-viewer.outputs.report-dir }} + - name: Publish Test Reports to Azure Storage + if: always() + uses: bacongobbler/azure-blob-storage-upload@v1.0.0 + with: + source_dir: ${{ steps.xunit-viewer.outputs.report-dir }} + container_name: docs + # http://tiny.cc/y1bznz + connection_string: ${{ secrets.AMROSDOC_AZURE_STORAGE_CONNECTION_STRING }} + extra_args: --destination-path ${{github.repository}}/test-reports + sync: true - name: Deploy if published if: steps.published.outputs.value == 'true' id: deploy From 941c666834756ccd8c398d36a3c2125f5eee2d7c Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Fri, 5 Jun 2020 13:31:08 -0700 Subject: [PATCH 22/25] test: leaving only 1 successful test AM-337/gtest --- test/sample_tests.cpp | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/test/sample_tests.cpp b/test/sample_tests.cpp index c4afa4eb..abc4b0ba 100644 --- a/test/sample_tests.cpp +++ b/test/sample_tests.cpp @@ -12,25 +12,6 @@ TEST(StrCompare, CStrEqual) EXPECT_STREQ(expectVal, actualValTrue); } -TEST(StrCompare, CStrEqual2) -{ - EXPECT_STREQ(expectVal, actualValTrue); -} - -TEST(StrCompare, CStrEqual3) -{ - EXPECT_STREQ(expectVal, actualValTrue); -} - -TEST(StrCompare, CStrNotEqual) -{ - EXPECT_STREQ(expectVal, actualValFalse); -} - -TEST(StrCompare, CStrNotEqual4) -{ - EXPECT_STREQ(expectVal, actualValFalse); -} int main(int argc, char** argv) { From 2ebdfe6856e6a819bee6b878ec4e6022872eabd4 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Fri, 5 Jun 2020 13:31:21 -0700 Subject: [PATCH 23/25] ci: naming test results to indicate failure check AM-337/gtest --- .github/workflows/package.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 9e693ea1..a849f138 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -37,7 +37,7 @@ jobs: file: '${{ steps.package.outputs.artifact-path }}' - name: Repo Name run: echo ::set-env name=REPOSITORY_NAME::$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//") - - name: Generate Test Reports + - name: Test Results if: always() id: xunit-viewer uses: AutoModality/action-xunit-viewer@v1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0ac254be..f61addf4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -87,7 +87,7 @@ jobs: - name: Repo Name if: steps.published.outputs.value == 'true' run: echo ::set-env name=REPOSITORY_NAME::$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//") - - name: Generate Test Reports + - name: Test Results if: steps.published.outputs.value == 'true' id: xunit-viewer uses: AutoModality/action-xunit-viewer@v1 From 20cc63b8ea3f4fa0d35af5485c801931ef6bcc99 Mon Sep 17 00:00:00 2001 From: Format Bot Date: Fri, 5 Jun 2020 20:37:47 +0000 Subject: [PATCH 24/25] style: Applied ROS C++ Style Guide --- test/sample_tests.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/test/sample_tests.cpp b/test/sample_tests.cpp index abc4b0ba..67965064 100644 --- a/test/sample_tests.cpp +++ b/test/sample_tests.cpp @@ -12,7 +12,6 @@ TEST(StrCompare, CStrEqual) EXPECT_STREQ(expectVal, actualValTrue); } - int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); From 9757890927ca16d61a8f6c1804243e9ebd8d93b2 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Fri, 5 Jun 2020 13:47:42 -0700 Subject: [PATCH 25/25] fix: removed DJI dependency ci: only running test if release published master --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f61addf4..786a56d2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -94,13 +94,13 @@ jobs: with: results: catkin_ws/build/${{env.REPOSITORY_NAME}}/test_results/${{env.REPOSITORY_NAME}} - name: Attach Test Reports - if: always() + if: steps.published.outputs.value == 'true' uses: actions/upload-artifact@v1 with: name: ${{ steps.xunit-viewer.outputs.report-name }} path: ${{ steps.xunit-viewer.outputs.report-dir }} - name: Publish Test Reports to Azure Storage - if: always() + if: steps.published.outputs.value == 'true' uses: bacongobbler/azure-blob-storage-upload@v1.0.0 with: source_dir: ${{ steps.xunit-viewer.outputs.report-dir }}