Commit f46041ca authored by Jonatan Antoni's avatar Jonatan Antoni
Browse files

Updates for upcoming release

parent 0df68997

.devcontainer/ubuntu-22.04/vcpkg-configuration.json

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
    "registries": [

    "registries": [

      {

      {

        "kind": "artifact",

        "kind": "artifact",

        "location": "https://artifacts.tools.arm.com/vcpkg-ce-registry/registry.zip",

        "location": "https://artifacts.tools.arm.com/vcpkg-registry",

        "name": "arm"

        "name": "arm"

      }

      }

    ],

    ],

.github/workflows/core.yml

+8 −39
Original line number Original line Diff line number Diff line
@@ -33,14 +33,6 @@ jobs: 
        run: |

        run: |

          pip install -r ./CMSIS/Core/Test/requirements.txt

          pip install -r ./CMSIS/Core/Test/requirements.txt





      - name: Cache vcpkg

        uses: actions/cache@v4

        with:

          key: vcpkg-${{ runner.os }}-${{ runner.arch }}-${{ github.run_id }}-${{ matrix.compiler }}

          restore-keys: |

            vcpkg-${{ runner.os }}-${{ runner.arch }}-

          path: /home/runner/.vcpkg



      - name: Install LLVM dependencies and tools

      - name: Install LLVM dependencies and tools

        working-directory: /home/runner

        working-directory: /home/runner

        run: |

        run: |
@@ -48,48 +40,25 @@ jobs: 
          sudo apt-get install libtinfo5 llvm-15-tools

          sudo apt-get install libtinfo5 llvm-15-tools

          sudo ln -s /usr/bin/FileCheck-15 /usr/bin/FileCheck

          sudo ln -s /usr/bin/FileCheck-15 /usr/bin/FileCheck

    

    

      - name: Prepare vcpkg env

      - name: Activate vcpkg environment

        working-directory: ./CMSIS/Core/Test

        uses: ARM-software/cmsis-actions/vcpkg@v1

        run: |

        with:

          . <(curl https://aka.ms/vcpkg-init.sh -L)

          config: ./CMSIS/Core/Test/vcpkg-configuration.json

          vcpkg x-update-registry --all

          vcpkg activate

          

          

      - name: Activate Arm tool license

      - name: Activate Arm tool license

        working-directory: ./CMSIS/Core/Test

        uses: ARM-software/cmsis-actions/armlm@v1

        run: |

        with:

          . /home/runner/.vcpkg/vcpkg-init

          code: "${{ env.ARM_UBL_ACTIVATION_CODE }}"

          vcpkg activate

          if [[ -n "${{ env.ARM_UBL_ACTIVATION_CODE }}" ]]; then

            armlm activate --code ${{ env.ARM_UBL_ACTIVATION_CODE }}

          else

            armlm activate --server https://mdk-preview.keil.arm.com --product KEMDK-COM0

          fi





      - uses: ammaraskar/gcc-problem-matcher@master

      - uses: ammaraskar/gcc-problem-matcher@master





      - name: Run LIT

      - name: Run LIT

        working-directory: ./CMSIS/Core/Test

        working-directory: ./CMSIS/Core/Test

        run: |

        run: |

          . /home/runner/.vcpkg/vcpkg-init

          vcpkg activate



          ./build.py lit

          ./build.py lit





      - name: Deactivate Arm tool license

        if: always()

        working-directory: ./CMSIS/Core/Test

        run: |

          . /home/runner/.vcpkg/vcpkg-init

          vcpkg activate

          if [[ -n "${{ env.ARM_UBL_ACTIVATION_CODE }}" ]]; then

            armlm deactivate --code ${{ env.ARM_UBL_ACTIVATION_CODE }}

          else

            armlm deactivate --product KEMDK-COM0

          fi



      - name: Publish Test Results

      - name: Publish Test Results

        if: ${{ !cancelled() && env.ARM_UBL_ACTIVATION_CODE }}

        if: ${{ !cancelled() }}

        uses: EnricoMi/publish-unit-test-result-action@v2

        uses: EnricoMi/publish-unit-test-result-action@v2

        with:

        with:

          report_individual_runs: true

          report_individual_runs: true

.github/workflows/corevalidation.yml

+11 −46
Original line number Original line Diff line number Diff line
@@ -56,14 +56,6 @@ jobs: 
        run: |

        run: |

          pip install -r ./CMSIS/CoreValidation/Project/requirements.txt

          pip install -r ./CMSIS/CoreValidation/Project/requirements.txt





      - name: Cache vcpkg

        uses: actions/cache@v4

        with:

          key: vcpkg-${{ runner.os }}-${{ runner.arch }}-${{ github.run_id }}-${{ matrix.compiler }}

          restore-keys: |

            vcpkg-${{ runner.os }}-${{ runner.arch }}-

          path: /home/runner/.vcpkg



      - name: Install LLVM/Clang dependencies

      - name: Install LLVM/Clang dependencies

        if: matrix.compiler == 'Clang'

        if: matrix.compiler == 'Clang'

        working-directory: /home/runner

        working-directory: /home/runner
@@ -71,23 +63,15 @@ jobs: 
          sudo apt-get update

          sudo apt-get update

          sudo apt-get install libtinfo5

          sudo apt-get install libtinfo5

    

    

      - name: Prepare vcpkg env

      - name: Activate vcpkg environment

        working-directory: ./CMSIS/CoreValidation/Project

        uses: ARM-software/cmsis-actions/vcpkg@v1

        run: |

        with:

          . <(curl https://aka.ms/vcpkg-init.sh -L)

          config: ./CMSIS/CoreValidation/Project/vcpkg-configuration.json

          vcpkg x-update-registry --all

          vcpkg activate

          

          

      - name: Activate Arm tool license

      - name: Activate Arm tool license

        working-directory: ./CMSIS/CoreValidation/Project

        uses: ARM-software/cmsis-actions/armlm@v1

        run: |

        with:

          . /home/runner/.vcpkg/vcpkg-init

          code: "${{ env.ARM_UBL_ACTIVATION_CODE }}"

          vcpkg activate

          if [[ -n "${{ env.ARM_UBL_ACTIVATION_CODE }}" ]]; then

            armlm activate --code ${{ env.ARM_UBL_ACTIVATION_CODE }}

          else

            armlm activate --server https://mdk-preview.keil.arm.com --product KEMDK-COM0

          fi

      

      

      - name: Initialize CodeQL

      - name: Initialize CodeQL

        if: matrix.compiler == 'GCC'

        if: matrix.compiler == 'GCC'
@@ -102,9 +86,6 @@ jobs: 
      - name: Build

      - name: Build

        working-directory: ./CMSIS/CoreValidation/Project

        working-directory: ./CMSIS/CoreValidation/Project

        run: |

        run: |

          . /home/runner/.vcpkg/vcpkg-init

          vcpkg activate



          echo "Register local Cortex_DFP pack"

          echo "Register local Cortex_DFP pack"

          cpackget add /home/runner/Cortex_DFP/ARM.Cortex_DFP.pdsc

          cpackget add /home/runner/Cortex_DFP/ARM.Cortex_DFP.pdsc
@@ -116,29 +97,13 @@ jobs: 
        uses: github/codeql-action/analyze@v3

        uses: github/codeql-action/analyze@v3





      - name: Execute

      - name: Execute

        if: ${{ env.ARM_UBL_ACTIVATION_CODE }}

        working-directory: ./CMSIS/CoreValidation/Project

        working-directory: ./CMSIS/CoreValidation/Project

        run: |     

        run: |     

          . /home/runner/.vcpkg/vcpkg-init

          vcpkg activate

      

          echo "Run test projects ..."

          echo "Run test projects ..."

          ./build.py --verbose -c ${{ matrix.compiler }} -d "CM*" run || echo "::warning::==== Some configurations failed to run! ==="

          ./build.py --verbose -c ${{ matrix.compiler }} -d "CM*" run || echo "::warning::==== Some configurations failed to run! ==="





      - name: Deactivate Arm tool license

        if: always()

        working-directory: ./CMSIS/CoreValidation/Project

        run: |

          . /home/runner/.vcpkg/vcpkg-init

          vcpkg activate

          if [[ -n "${{ env.ARM_UBL_ACTIVATION_CODE }}" ]]; then

            armlm deactivate --code ${{ env.ARM_UBL_ACTIVATION_CODE }}

          else

            armlm deactivate --product KEMDK-COM0

          fi



      - name: Archive Test Reports

      - name: Archive Test Reports

        if: ${{ !cancelled() && env.ARM_UBL_ACTIVATION_CODE }}

        if: ${{ !cancelled() }}

        uses: actions/upload-artifact@v4

        uses: actions/upload-artifact@v4

        with:

        with:

          name: test-results-${{ matrix.compiler }}

          name: test-results-${{ matrix.compiler }}

CMSIS/Core/Include/cmsis_version.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -31,13 +31,13 @@ 




/*  CMSIS-Core(M) Version definitions */

/*  CMSIS-Core(M) Version definitions */

#define __CM_CMSIS_VERSION_MAIN  ( 6U)                                    /*!< \brief [31:16] CMSIS-Core(M) main version */

#define __CM_CMSIS_VERSION_MAIN  ( 6U)                                    /*!< \brief [31:16] CMSIS-Core(M) main version */

#define __CM_CMSIS_VERSION_SUB   ( 0U)                                    /*!< \brief [15:0]  CMSIS-Core(M) sub version */

#define __CM_CMSIS_VERSION_SUB   ( 1U)                                    /*!< \brief [15:0]  CMSIS-Core(M) sub version */

#define __CM_CMSIS_VERSION       ((__CM_CMSIS_VERSION_MAIN << 16U) | \

#define __CM_CMSIS_VERSION       ((__CM_CMSIS_VERSION_MAIN << 16U) | \

                                   __CM_CMSIS_VERSION_SUB           )     /*!< \brief CMSIS Core(M) version number */

                                   __CM_CMSIS_VERSION_SUB           )     /*!< \brief CMSIS Core(M) version number */





/*  CMSIS-Core(A) Version definitions */

/*  CMSIS-Core(A) Version definitions */

#define __CA_CMSIS_VERSION_MAIN  ( 6U)                                    /*!< \brief [31:16] CMSIS-Core(A) main version */

#define __CA_CMSIS_VERSION_MAIN  ( 6U)                                    /*!< \brief [31:16] CMSIS-Core(A) main version */

#define __CA_CMSIS_VERSION_SUB   ( 0U)                                    /*!< \brief [15:0]  CMSIS-Core(A) sub version */

#define __CA_CMSIS_VERSION_SUB   ( 1U)                                    /*!< \brief [15:0]  CMSIS-Core(A) sub version */

#define __CA_CMSIS_VERSION       ((__CA_CMSIS_VERSION_MAIN << 16U) | \

#define __CA_CMSIS_VERSION       ((__CA_CMSIS_VERSION_MAIN << 16U) | \

                                   __CA_CMSIS_VERSION_SUB          )      /*!< \brief CMSIS-Core(A) version number */

                                   __CA_CMSIS_VERSION_SUB          )      /*!< \brief CMSIS-Core(A) version number */

CMSIS/Core/Test/vcpkg-configuration.json

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
    "registries": [

    "registries": [

      {

      {

        "kind": "artifact",

        "kind": "artifact",

        "location": "https://artifacts.tools.arm.com/vcpkg-ce-registry/registry.zip",

        "location": "https://artifacts.tools.arm.com/vcpkg-registry",

        "name": "arm"

        "name": "arm"

      }

      }

    ],

    ],

CRA Git | Maintained and supported by SUSTech CRA and CCSE