diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 0ab2ddcff..daed82a2c 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -20,7 +20,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get install -y gcc g++ cmake golang uuid-dev + sudo apt-get install -y gcc g++ cmake golang uuid-dev libssl-dev lcov - name: Run pre-build script run: | @@ -30,3 +30,37 @@ jobs: - name: Run unit tests run: ./build_linux64/Output/amc_unittest + + coverage: + runs-on: ubuntu-latest + needs: build-and-test + if: ${{ success() }} + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Install dependencies + run: | + sudo apt-get update + sudo apt-get install -y gcc g++ cmake golang uuid-dev libssl-dev lcov + + - name: Run pre-build script (hashes and baseline) + run: | + chmod +x ./build_clean_linux64.sh + ./build_clean_linux64.sh + shell: bash + + - name: Run coverage (unit tests) + run: | + chmod +x ./coverage_linux.sh + ./coverage_linux.sh + shell: bash + + - name: Upload coverage report + uses: actions/upload-artifact@v4 + with: + name: coverage-report + path: | + build_coverage/coverage_html + build_coverage/coverage.info diff --git a/.gitignore b/.gitignore index c59489872..eaebb0f00 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,8 @@ build_win64 build_linux64 build_rpi build_client +build_coverage +build_clientdist_tools ACT/LibMC_component ACT/LibMCDriverEnv_component ACT/LibMCDriver_component @@ -25,6 +27,14 @@ Client/.DS_Store Client/node_modules Client/dist Client/dist.xml +Client/vue2/.DS_Store +Client/vue2/node_modules +Client/vue2/dist +Client/vue2/dist.xml +Client/vue3/.DS_Store +Client/vue3/node_modules +Client/vue3/dist +Client/vue3/dist.xml # local env files Client/.env.local @@ -44,7 +54,30 @@ Client/*.njsproj Client/*.sln Client/*.sw? +ClientV3/.DS_Store +ClientV3/node_modules +ClientV3/dist +ClientV3/dist.xml + +# local env files +ClientV3/.env.local +ClientV3/.env.*.local + +# Log files +ClientV3/npm-debug.log* +ClientV3/yarn-debug.log* +ClientV3/yarn-error.log* + +# Editor directories and files +ClientV3/.idea +ClientV3/.vscode +ClientV3/*.suo +ClientV3/*.ntvs* +ClientV3/*.njsproj +ClientV3/*.sln +ClientV3/*.sw? + Framework/HeadersCore/Go Drivers/ScanLab/Dependencies Drivers/ScanLab/BinaryData -Drivers/Marlin/BinaryData \ No newline at end of file +Drivers/Marlin/BinaryData diff --git a/ACT/LibMC.xml b/ACT/LibMC.xml index 4096d0a73..f05cdba9c 100644 --- a/ACT/LibMC.xml +++ b/ACT/LibMC.xml @@ -705,7 +705,40 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -727,6 +760,7 @@ + @@ -838,6 +872,11 @@ + + + + + diff --git a/ACT/LibMCData.xml b/ACT/LibMCData.xml index 2e1ae4706..108641f46 100644 --- a/ACT/LibMCData.xml +++ b/ACT/LibMCData.xml @@ -445,16 +445,18 @@ + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -727,8 +770,147 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -762,6 +944,7 @@ + @@ -783,8 +966,7 @@ - - + @@ -1455,6 +1637,10 @@ + + + + @@ -1519,6 +1705,14 @@ + + + + + + + + @@ -1672,6 +1866,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -2043,7 +2258,16 @@ - + + + + + + + + + + diff --git a/ACT/LibMCEnv.xml b/ACT/LibMCEnv.xml index 143e3f965..9c519374a 100644 --- a/ACT/LibMCEnv.xml +++ b/ACT/LibMCEnv.xml @@ -290,11 +290,18 @@ + + + + + + + + + + - - - @@ -436,8 +443,17 @@ - - + + + @@ -515,7 +531,7 @@