Merge branch 'eclipse-leda:main' into main

Author: OleksandrChaika

.github/actions/build-container-image/action.yaml

@@ -1,4 +1,4 @@
-#    Copyright 2022 Contributors to the Eclipse Foundation
+#    Copyright 2023 Contributors to the Eclipse Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

.github/actions/build-native-binary/action.yaml

@@ -1,4 +1,4 @@
-#    Copyright 2022 Contributors to the Eclipse Foundation
+#    Copyright 2023 Contributors to the Eclipse Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -64,56 +64,92 @@ runs:
         -DOPENSSL_ROOT_DIR=../build_${{ matrix.arch }} \
         -DOPENSSL_CRYPTO_LIBRARY=../build_${{ matrix.arch }}/lib/libcrypto.so \
         -DSUA_BUILD_NUMBER=${{ inputs.run_number }} \
-        -DSUA_BUILD_TESTS=NO \
+        -DSUA_BUILD_TESTS=YES \
+        -DSUA_MEASURE_CODE_COVERAGE=NO \
         ..
       make -j
       make install
     shell: bash
 
-  - name: Build for ${{ inputs.arch }} (with code-coverage enabled)
-    if: ${{ inputs.arch=='amd64' }}
+  - name: Build for amd64 with code-coverage enabled
+    if: ${{ inputs.arch == 'amd64' }}
     run: |
       cd build_${{ inputs.arch }}
       cmake \
-        -DCMAKE_INSTALL_PREFIX=../dist_${{ inputs.arch }}_testing \
+        -DCMAKE_INSTALL_PREFIX=../dist_${{ inputs.arch }}_codecov \
         -DCMAKE_TOOLCHAIN_FILE=../cmake/linux/${{ matrix.arch }}/toolchain.cmake \
         -DOPENSSL_ROOT_DIR=../build_${{ matrix.arch }} \
         -DOPENSSL_CRYPTO_LIBRARY=../build_${{ matrix.arch }}/lib/libcrypto.so \
         -DSUA_BUILD_NUMBER=${{ inputs.run_number }} \
         -DSUA_BUILD_TESTS=YES \
+        -DSUA_MEASURE_CODE_COVERAGE=YES \
         ..
       make -j
       make install
     shell: bash
 
-  - name: Run unit tests
-    if: ${{ inputs.arch=='amd64' }}
+  - name: Run unit tests for amd64
+    if: ${{ inputs.arch == 'amd64' }}
+    run: |
+      cd dist_${{ inputs.arch }}/utest
+      ls -la
+      chmod +x TestSelfUpdateAgent
+      uname -a
+      file TestSelfUpdateAgent
+      ./TestSelfUpdateAgent > ../../unit_tests_report_${{ inputs.arch }}.txt
+    shell: bash
+
+  - uses: uraimo/run-on-arch-action@v2
+    name: Run unit tests for arm64
+    if: ${{ inputs.arch == 'arm64' }}
+    with:
+      arch: aarch64
+      distro: ubuntu_latest
+      dockerRunArgs: |
+        --volume "${PWD}:/sua"
+      shell: /bin/sh
+      run: |
+        cd /sua/dist_arm64/utest
+        ls -la ../lib
+        ldd TestSelfUpdateAgent
+        LD_LIBRARY_PATH=../lib ./TestSelfUpdateAgent > ../../unit_tests_report_arm64.txt
+
+  - name: Collect code-coverage for amd64
+    if: ${{ inputs.arch == 'amd64' }}
     run: |
-      cd dist_${{ inputs.arch }}_testing/utest
-      ./TestSelfUpdateAgent > ../../unit_tests_report.txt
+      cd dist_${{ inputs.arch }}_codecov/utest
+      ./TestSelfUpdateAgent
     shell: bash
 
-  - name: Generate reports
-    if: ${{ (inputs.arch=='amd64') && (success() || failure()) }}
+  - name: Generate code-coverage report
+    if: ${{ (inputs.arch == 'amd64') && (success() || failure()) }}
     run: |
-      cd dist_${{ inputs.arch }}_testing/utest
+      cd dist_${{ inputs.arch }}_codecov/utest
 
       mkdir report
       gcovr --root ../.. --html --html-details --output report/coverage.html -e ../../3rdparty -e ../../utest -e ../../src/main.cpp
       gcovr --root ../.. --txt --output report/coverage.txt -e ../../3rdparty -e ../../utest -e ../../src/main.cpp
       tar -czvf ../../code-coverage.tar.gz report
 
-      echo -e "### Code Coverage Summary\n" >> report.md
+      echo -e "### Code-coverage summary for" ${{ inputs.arch }} "\n" >> report.md
       echo -e "\`\`\`" >> report.md
       cat report/coverage.txt >> report.md
       echo -e "\n\`\`\`\n" >> report.md
 
-      echo -e "### Unit Tests Results\n" >> report.md
+      cat report.md >> $GITHUB_STEP_SUMMARY
+    shell: bash
+
+  - name: Generate unit tests report for ${{ inputs.arch }}
+    if: ${{ success() || failure() }}
+    run: |
+      cd dist_${{ inputs.arch }}/utest
+
+      echo -e "### Unit tests results for" ${{ inputs.arch }} "\n" >> report.md
       echo -e "\`\`\`" >> report.md
-      cat ../../unit_tests_report.txt >> report.md
+      cat ../../unit_tests_report_${{ inputs.arch }}.txt >> report.md
       echo -e "\n\`\`\`\n" >> report.md
 
-      cat report.md > $GITHUB_STEP_SUMMARY
+      cat report.md >> $GITHUB_STEP_SUMMARY
     shell: bash
 
   - name: Compress artifacts

.github/workflows/main.yaml

@@ -1,4 +1,4 @@
-#    Copyright 2022 Contributors to the Eclipse Foundation
+#    Copyright 2023 Contributors to the Eclipse Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -98,17 +98,16 @@ jobs:
         with:
           path: self-update-agent-${{ matrix.arch }}-build-${{ github.run_number }}.tar.gz
 
-      - name: Upload code coverage results to workspace
+      - name: Upload code-coverage results to workspace
         if: ${{ matrix.arch == 'amd64' }}
         uses: actions/upload-artifact@v3
         with:
           path: code-coverage.tar.gz
 
       - name: Upload unit tests results to workspace
-        if: ${{ matrix.arch == 'amd64' }}
         uses: actions/upload-artifact@v3
         with:
-          path: unit_tests_report.txt
+          path: unit_tests_report_${{ matrix.arch }}.txt
 
   upload-native-binary:
     runs-on: ubuntu-latest
@@ -131,7 +130,8 @@ jobs:
           automatic_release_tag: build_${{ github.run_number }}
           title: "Build ${{ github.run_number }}"
           files: |
-            ./artifact/unit_tests_report.txt
+            ./artifact/unit_tests_report_amd64.txt
+            ./artifact/unit_tests_report_arm64.txt
             ./artifact/code-coverage.tar.gz
             ./artifact/self-update-agent-amd64-build-${{ github.run_number }}.tar.gz
             ./artifact/self-update-agent-arm64-build-${{ github.run_number }}.tar.gz

.github/workflows/main_developer.yaml

@@ -1,4 +1,4 @@
-#    Copyright 2022 Contributors to the Eclipse Foundation
+#    Copyright 2023 Contributors to the Eclipse Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

.github/workflows/ocaas.yaml

@@ -1,4 +1,4 @@
-#    Copyright 2022 Contributors to the Eclipse Foundation
+#    Copyright 2023 Contributors to the Eclipse Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

3rdparty/CMakeLists.txt

@@ -25,3 +25,18 @@ add_subdirectory(curl)
 if(SUA_BUILD_TESTS)
   add_subdirectory(googletest)
 endif()
+
+install(
+    FILES
+        ${CMAKE_BINARY_DIR}/lib/libssl.so.3
+        ${CMAKE_BINARY_DIR}/lib/libcrypto.so.3
+        ${CMAKE_BINARY_DIR}/3rdparty/curl/lib/libcurl.so
+        ${CMAKE_BINARY_DIR}/glib/subprojects/zlib-1.2.11/libz.so
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+)
+
+install(FILES ${CMAKE_BINARY_DIR}/glib/gio/libgio-2.0.so.0.7300.0             DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgio-2.0.so.0)
+install(FILES ${CMAKE_BINARY_DIR}/glib/glib/libglib-2.0.so.0.7300.0           DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libglib-2.0.so.0)
+install(FILES ${CMAKE_BINARY_DIR}/glib/gmodule/libgmodule-2.0.so.0.7300.0     DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgmodule-2.0.so.0)
+install(FILES ${CMAKE_BINARY_DIR}/glib/gobject/libgobject-2.0.so.0.7300.0     DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgobject-2.0.so.0)
+install(FILES ${CMAKE_BINARY_DIR}/glib/subprojects/libffi/src/libffi.so.7.1.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libffi.so.7)

CMakeLists.txt

@@ -8,6 +8,7 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 set(CMAKE_INSTALL_RPATH ../lib)
 
 option(SUA_BUILD_TESTS "Build unit tests with code-coverage report enabled" OFF)
+option(SUA_MEASURE_CODE_COVERAGE "Measure code-coverage" OFF)
 
 include(cmake/dependencies.cmake)
 

cmake/dependencies.cmake

@@ -12,7 +12,6 @@ else ()
     )
 endif()
 
-
 add_library(ssl_lib SHARED IMPORTED)
 set_property(
     TARGET ssl_lib

scripts/build_glib_amd64.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 cd 3rdparty/glib
-meson subprojects download
-meson setup -Dwrap_mode=forcefallback ../../build_amd64/glib
-meson compile -j `nproc` -C ../../build_amd64/glib
+meson subprojects download > /dev/null
+meson setup -Dwrap_mode=forcefallback ../../build_amd64/glib > /dev/null
+meson compile -j `nproc` -C ../../build_amd64/glib > /dev/null

scripts/build_glib_arm64.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 cd 3rdparty/glib
-meson subprojects download
-meson setup -Dwrap_mode=forcefallback --cross-file=../meson-cross-file-aarch64.txt ../../build_arm64/glib
-meson compile -j `nproc` -C ../../build_arm64/glib
+meson subprojects download > /dev/null
+meson setup -Dwrap_mode=forcefallback --cross-file=../meson-cross-file-aarch64.txt ../../build_arm64/glib > /dev/null
+meson compile -j `nproc` -C ../../build_arm64/glib > /dev/null

scripts/build_openssl_amd64.sh

@@ -9,6 +9,6 @@ cd build_amd64/3rdparty/openssl
 	--libdir=lib \
 	shared \
 	-Wl,-rpath=$rootdir/build_amd64/lib \
-	-Wl,--enable-new-dtags
-make -j
-make install_sw
+	-Wl,--enable-new-dtags > /dev/null
+make -j > /dev/null
+make install_sw > /dev/null

scripts/build_openssl_arm64.sh

@@ -14,6 +14,6 @@ RANLIB=aarch64-linux-gnu-ranlib \
         --libdir=lib \
         shared \
         -Wl,-rpath=$rootdir/build_arm64/lib \
-        -Wl,--enable-new-dtags
-make -j
-make install_sw
+        -Wl,--enable-new-dtags > /dev/null
+make -j > /dev/null
+make install_sw > /dev/null

src/CMakeLists.txt

@@ -10,7 +10,7 @@ if(NOT DEFINED SUA_BUILD_NUMBER)
     set(SUA_BUILD_NUMBER "local")
 endif()
 
-if(SUA_BUILD_TESTS)
+if(SUA_MEASURE_CODE_COVERAGE)
     add_compile_options(
         -fprofile-arcs
         -ftest-coverage
@@ -63,16 +63,10 @@ target_link_libraries(${PROJECT_NAME}
     sua
 )
 
-if(SUA_BUILD_TESTS)
+if(SUA_MEASURE_CODE_COVERAGE)
     target_link_libraries(sua gcov)
 endif()
 
 install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 install(TARGETS sua LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 
-install(
-    FILES
-        ${CMAKE_BINARY_DIR}/lib/libssl.so.3
-        ${CMAKE_BINARY_DIR}/lib/libcrypto.so.3
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-)