Add dev binaries

soumeh01 · May 27, 2024 · 944ab79 · 944ab79
1 parent ae700ec
commit 944ab79
Show file tree

Hide file tree

Showing 2 changed files with 190 additions and 66 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -31,15 +31,130 @@ jobs:
             target: darwin
             extn:
     steps:
-      - name: Checkout repository
+      - name: Authenticate with GitHub CLI
+        shell: bash
+        run: |
+          echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token
+
+      - name: Get latest nightly run_id
+        id: get_run_id
+        shell: bash
+        run: |
+          RUN_ID=$(gh run list --limit 1 --workflow nightly --repo Open-CMSIS-Pack/devtools --json databaseId --jq '.[0].databaseId')
+          echo "NIGHTLY_RUN_ID=$RUN_ID" >> $GITHUB_OUTPUT
+
+      # Download and build cbuild executable
+      - name: Checkout cbuild repository
+        uses: actions/checkout@v4
+        with:
+          repository: Open-CMSIS-PACK/cbuild
+          path: cbuild
+
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: cbuild/go.mod
+          cache-dependency-path: |
+            **/go.mod
+            **/go.sum
+
+      - name: Build cbuild executable
+        working-directory: cbuild
+        shell: bash
+        run: |
+          GOOS=${{ matrix.target }} GOARCH=${{ matrix.arch }} go build -ldflags "-X main.version=$(git describe --tags)" -o build/cbuild${{ matrix.extn }} ./cmd/cbuild
+
+      # Download and build cpackget executable
+      - name: Checkout cpackget repository
         uses: actions/checkout@v4
+        with:
+          repository: Open-CMSIS-PACK/cpackget
+          path: cpackget
+
+      - name: Build cpackget executable
+        working-directory: cpackget
+        shell: bash
+        run: |
+          GOOS=${{ matrix.target }} GOARCH=${{ matrix.arch }} go build -ldflags "-X main.version=$(git describe --tags)" -o build/cpackget${{ matrix.extn }} ./cmd
 
+      # Download and build cbuild2cmake executable
+      - name: Checkout cbuild2cmake repository
+        uses: actions/checkout@v4
+        with:
+          repository: Open-CMSIS-PACK/cbuild2cmake
+          path: cbuild2cmake
+
+      - name: Build cbuild2cmake executable
+        working-directory: cbuild2cmake
+        shell: bash
+        run: |
+          GOOS=${{ matrix.target }} GOARCH=${{ matrix.arch }} go build -ldflags "-X main.version=$(git describe --tags)" -o build/cbuild2cmake${{ matrix.extn }} ./cmd/cbuild2cmake
+
+      # Download projmgr and cbuildgen from nightly
+      - name: Download Open-CMSIS-Pack/devtools nightly artifacts
+        shell: bash
+        run : |
+          gh run download -D projmgr-${{ matrix.target }}-${{ matrix.arch }} ${{ steps.get_run_id.outputs.NIGHTLY_RUN_ID }} -n projmgr-${{ matrix.target }}-${{ matrix.arch }} -R Open-CMSIS-Pack/devtools
+          gh run download -D cbuildgen-${{ matrix.target }}-${{ matrix.arch }} ${{ steps.get_run_id.outputs.NIGHTLY_RUN_ID }} -n cbuildgen-${{ matrix.target }}-${{ matrix.arch }} -R Open-CMSIS-Pack/devtools
+
+      - name: Checkout tools repo
+        uses: actions/checkout@v4
+        with:
+          repository: Open-CMSIS-PACK/devtools
+          path: devtools
+
+      - name: Copy Files
+        shell: bash
+        run: |
+          mkdir -p ./cmsis-toolbox/bin
+          mkdir -p ./cmsis-toolbox/etc
+          cp ./projmgr-${{ matrix.target }}-${{ matrix.arch }}/csolution${{ matrix.extn }}      ./cmsis-toolbox/bin/csolution${{ matrix.extn }}
+          cp ./cbuildgen-${{ matrix.target }}-${{ matrix.arch }}/cbuildgen${{ matrix.extn }}*    ./cmsis-toolbox/bin/cbuildgen${{ matrix.extn }}
+          cp ./cbuild/build/cbuild${{ matrix.extn }}              ./cmsis-toolbox/bin/cbuild${{ matrix.extn }}
+          cp ./cpackget/build/cpackget${{ matrix.extn }}          ./cmsis-toolbox/bin/cpackget${{ matrix.extn }}
+          cp ./cbuild2cmake/build/cbuild2cmake${{ matrix.extn }}  ./cmsis-toolbox/bin/cbuild2cmake${{ matrix.extn }}
+          cp -r devtools/tools/projmgr/templates/*                ./cmsis-toolbox/etc
+          cp -r devtools/tools/projmgr/schemas/*                  ./cmsis-toolbox/etc
+          cp -r devtools/tools/buildmgr/cbuildgen/scripts/*       ./cmsis-toolbox/etc
+
+      - name: List files
+        shell: bash
+        run: |
+          ls -l ./cmsis-toolbox/bin
+          ls -l ./cmsis-toolbox/etc
+
+      - name: Archieve test results
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: cmsis-toolbox-${{ matrix.target }}-${{ matrix.arch }}
+          path: cmsis-toolbox
+
+  run-tests:
+    needs: [download-assets]
+    runs-on: ${{ matrix.os }}
+    continue-on-error: true
+    strategy:
+      matrix:
+        os: [windows-latest, ubuntu-latest, macos-13]
+        arch: [amd64, arm64]
+        include:
+          - os: windows-latest
+            target: windows
+          - os: ubuntu-latest
+            target: linux
+          - os: macos-13
+            target: darwin
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: '3.11'
           cache: 'pip'
-
+    
       - name: Install pip dependencies
         run: |
             pip install --upgrade pip
@@ -51,93 +166,102 @@ jobs:
           config: "./test/vcpkg-configuration.json"
           vcpkg-downloads: "${{ github.workspace }}/.vcpkg/downloads"
           cache: "-"
-
+    
       - name: Activate Arm tool license
         run: |
           armlm activate --server https://mdk-preview.keil.arm.com --product KEMDK-COM0
         working-directory: ./test
 
-      - name: Authenticate with GitHub CLI
-        shell: bash
-        run: |
-          echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token
-        # gh auth login --with-token < "${{ secrets.GITHUB_TOKEN }}"
+      - name: Download cmsis toolbox ${{ matrix.target }} ${{ matrix.arch }}
+        uses: actions/download-artifact@v4
+        with:
+          name: cmsis-toolbox-${{ matrix.target }}-${{ matrix.arch }}
+          path: cmsis-toolbox
 
-      - name: Get latest nightly projmgr artifacts
-        id: get_run_id
-        shell: bash
+      - name: Get installed path
+        if: always()
+        id: toolbox_path
         run: |
-          RUN_ID=$(gh run list --limit 1 --workflow nightly --repo Open-CMSIS-Pack/devtools --json databaseId --jq '.[0].databaseId')
-          echo "PROJMGR_LATEST_RUN_ID=$RUN_ID" >> $GITHUB_OUTPUT
-
-      - name: Download ProjMgr nightly artifacts
-        shell: bash
-        run : |
-          gh run download -D projmgr-${{ matrix.target }}-${{ matrix.arch }} ${{ steps.get_run_id.outputs.PROJMGR_LATEST_RUN_ID }} -n projmgr-${{ matrix.target }}-${{ matrix.arch }} -R Open-CMSIS-Pack/devtools
-
-      - name: List downloaded files
-        shell: bash
-        run: ls -l projmgr-${{ matrix.target }}-${{ matrix.arch }}
+          echo "set path variable with new path"
+          echo "$(pwd)/cmsis-toolbox/bin"
+          echo "path=$(echo $(pwd)/cmsis-toolbox/bin)" >> $GITHUB_OUTPUT
 
       - name: csolution version before
-        shell: bash  
-        run: |
-            csolution -V
-
-      - name: Get binary path
         shell: bash
         run: |
-          CSOLUTION_PATH=$(which csolution)
-          BIN_DIR=$(dirname $CSOLUTION_PATH)
-          echo "$BIN_DIR"
-          cp ./projmgr-${{ matrix.target }}-${{ matrix.arch }}/csolution${{ matrix.extn }} $BIN_DIR/csolution${{ matrix.extn }}
-
-      - name: List downloaded files
-        shell: bash
-        run: |
-          CSOLUTION_PATH=$(which cbuild)
-          BIN_DIR=$(dirname $CSOLUTION_PATH)
-          ls -l $BIN_DIR
+            echo "${{steps.toolbox_path.outputs.path}}" 
+            export PATH="${{steps.toolbox_path.outputs.path}}${PATH:+:${PATH}}"
+            csolution -V
+            cpackget -V
+            cbuild -V
+            cbuildgen -V
+            which csolution
 
-      - name: csolution version after
+      - name: Env check
         shell: bash
         run: |
-          csolution -V
+          export PATH="${{steps.toolbox_path.outputs.path}}${PATH:+:${PATH}}"
+          env
 
       - name: Run Test
         shell: bash
         run: |
+          export PATH="${{steps.toolbox_path.outputs.path}}${PATH:+:${PATH}}"
           python -m robot --outputdir reports-${{ matrix.target }}-${{ matrix.arch }} --settag ${{ matrix.target }}-${{ matrix.arch }} --name ${{ matrix.target }}-${{ matrix.arch }} ./test
-  
+
       - name: Archieve test results
         if: always()
         uses: actions/upload-artifact@v4
         with:
           name: reports-${{ matrix.target }}-${{ matrix.arch }}
           path: reports-${{ matrix.target }}-${{ matrix.arch }}
 
-      # - name: Set up environment variables
-      #   run: |
-      #     echo "REPO_OWNER=Open-CMSIS-Pack" >> $GITHUB_ENV
-      #     echo "REPO_NAME=devtools" >> $GITHUB_ENV
-      #     echo "TOKEN=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV
-
-      # - name: Get latest release
-      #   id: get_latest
-      #   run: |
-      #     response=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
-      #                     "https://api.github.com/repos/${{ env.REPO_OWNER }}/${{ env.REPO_NAME }}/releases/latest")
-      #     tag_name=$(echo "$response" | jq -r .tag_name)
-      #     asset_urls=$(echo "$response" | jq -r '.assets[].browser_download_url')
-
-      #     echo "TAG_NAME=$tag_name" >> $GITHUB_ENV
-      #     echo "ASSET_URLS=$asset_urls" >> $GITHUB_ENV
-
-      # - name: Download assets
-      #   run: |
-      #     mkdir -p nightly_assets
-      #     IFS=$'\n'
-      #     for url in ${{ env.ASSET_URLS }}; do
-      #       curl -L -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -o nightly_assets/$(basename $url) $url
-      #     done
+  report:
+    runs-on: ubuntu-latest
+    if: always()
+    needs: run-tests
+    permissions: write-all
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.11'
+        cache: 'pip'
+
+    - name: Install pip dependencies
+      run: |
+          pip install --upgrade pip
+          pip install -r test/requirements.txt
+
+    - name: Download reports
+      uses: actions/download-artifact@v4
+      with:
+        path: artifacts
+        pattern: reports-*
+
+    - name: Consolidate robot test results
+      working-directory: artifacts
+      run: |
+        python -m robot.rebot --name Collective_Robot_Results --outputdir collective_robot_results --output output.xml \
+          ./reports-windows-amd64/output.xml ./reports-windows-arm64/output.xml \
+          ./reports-linux-amd64/output.xml ./reports-linux-arm64/output.xml \
+          ./reports-darwin-amd64/output.xml ./reports-darwin-arm64/output.xml
+
+    - name: Generate Summary report
+      if: always()
+      run: |
+        python ./test/lib/execution_summary.py artifacts/collective_robot_results/output.xml
+
+    - name: Print E2E Report
+      if: always()
+      run: cat summary_report.md >> $GITHUB_STEP_SUMMARY
 
+    - name: Archieve consolidated test results
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: consolidated-reports
+        path: artifacts/collective_robot_results
+
diff --git a/test/vcpkg-configuration.json b/test/vcpkg-configuration.json
@@ -7,7 +7,7 @@
     },
     {
       "kind": "artifact",
-      "location": "https://artifacts.tools.arm.com/vcpkg-ce-registry/registry.zip",
+      "location": "https://artifacts.tools.arm.com/vcpkg-registry",
       "name": "arm"
     }
   ],