stop redundant workflows

soumeh01 · Apr 9, 2024 · 80dc492 · 80dc492
1 parent 73ea431
commit 80dc492
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/.github/workflows/robot-tests.yml b/.github/workflows/robot-tests.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
 
-  validate:
+  robot-tests:
     runs-on: ubuntu-latest
     env:
       CMSIS_PACK_ROOT: /home/runner/.cache/arm/packs
@@ -42,41 +42,47 @@ jobs:
           path: /home/runner/.vcpkg
 
       - name: Prepare vcpkg env
-        working-directory: ./e2e-validation
+        working-directory: ./test
         run: |  
           . <(curl https://aka.ms/vcpkg-init.sh -L)
           vcpkg x-update-registry --all
           vcpkg activate
 
       - name: Activate Arm tool license
-        working-directory: ./e2e-validation
+        working-directory: ./test
         run: |
           . /home/runner/.vcpkg/vcpkg-init
           vcpkg activate
           armlm activate --server https://mdk-preview.keil.arm.com --product KEMDK-COM0
 
       - name: Run Test
+        working-directory: ./test
         run: |
-          python -m robot --outputdir results testcases/functional_tests
+          . /home/runner/.vcpkg/vcpkg-init
+          vcpkg activate
+          python -m robot --outputdir reports src/test.robot
 
-      - name: Run Test and create report
-        run: python -m robot -d reports -x junit-report.xml "testcases/functional_tests"
+      # - name: Run Test and create report
+      #   working-directory: ./test
+      #   run: |
+      #     python -m robot -d reports -x junit-report.xml "src/test.robot"
 
       - name: Run Robot Framework tests and generate report
+        if: always()
         run: |
-              echo "ROBOT_RC=$?" >> "$GITHUB_ENV"
+          echo "ROBOT_RC=$?" >> "$GITHUB_ENV"
 
       - name: Publish test results
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: reports
-          path: results
+          path: ./test/reports
 
   generate_report:
     runs-on: ubuntu-latest
+    needs: robot-tests
     steps:
-    - uses: actions/checkout@v4
-
     - name: Download reports
       uses: actions/download-artifact@v4
       with:

diff --git a/.github/workflows/toolbox.yml b/.github/workflows/toolbox.yml
@@ -8,11 +8,13 @@ on:
       - '**'
       - '!docs/**'
       - '!README.md'
+      - '!test/**'
   pull_request:
     paths:
       - '.github/workflows/toolbox.yml'
       - '**'
       - '!docs/**'
+      - '!test/**'
   release:
     types: [published]
 

diff --git a/test/resources/utils.resource b/test/resources/utils.resource
@@ -13,4 +13,4 @@ Run Program
 Run csolution
     [Documentation]    Run csolution example with specified arguments
     [Arguments]        ${input_file}    @{args}
-    Run Program        cbuild.exe     ${input_file}    @{args}
+    Run Program        cbuild           ${input_file}    @{args}
diff --git a/test/src/test.robot b/test/src/test.robot
@@ -11,8 +11,7 @@ ${RESOURCES}      ../resources
 
 
 *** Test Cases ***       ${input_file}    ${args}
-Run MyProject example    ${testDataDir}/MyProject${/}MyProject.csolution.yml    --context=MyProject_CM3.Debug+CM3    -r    --update-rte
-Run Hello example        ${testDataDir}/Hello${/}Hello.csolution.yml    -r    --update-rte
+Run Hello example        ${testDataDir}/Hello${/}Hello.csolution.yml    -p    -r    --update-rte
 
 
 *** Keywords ***

diff --git a/test/configs/vcpkg-configuration.json → test/vcpkg-configuration.json b/test/configs/vcpkg-configuration.json → test/vcpkg-configuration.json