🔀 Merge branch 'ladislas/feature/fix-ci-upgrade-dependencies' into de…

…velop
leka · Dec 13, 2023 · 778bf10 · 778bf10
2 parents 4ad27a0 + 3e252f2
commit 778bf10
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/.github/workflows/ci-code_analysis-sanitizers.yml b/.github/workflows/ci-code_analysis-sanitizers.yml
@@ -27,9 +27,10 @@ jobs:
       matrix:
         compiler:
           [
-            { name: Clang 14, cc: /usr/bin/clang-14, cxx: /usr/bin/clang++-14 },
+            { name: Clang 15, cc: /usr/bin/clang-15, cxx: /usr/bin/clang++-15 },
             { name: GCC 10, cc: /usr/bin/gcc-10, cxx: /usr/bin/g++-10 },
             { name: GCC 12, cc: /usr/bin/gcc-12, cxx: /usr/bin/g++-12 },
+            { name: GCC 13, cc: /usr/bin/gcc-13, cxx: /usr/bin/g++-13 },
           ]
         optimisation_level: ["-Og", "-Os"]
 

diff --git a/.github/workflows/ci-functional_tests.yml b/.github/workflows/ci-functional_tests.yml
@@ -26,6 +26,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Setup
+        run: |
+          brew update && brew upgrade
+          brew upgrade arm-gcc-bin
+          python3 -m pip install -U --user -r ./tools/config/mbed_requirements.txt
+
       #
       # Mark: - Config & Build
       #

diff --git a/.github/workflows/ci-unit_tests.yml b/.github/workflows/ci-unit_tests.yml
@@ -26,11 +26,11 @@ jobs:
       fail-fast: false
       matrix:
         compiler: [
-            { name: Clang 13, cc: /usr/bin/clang-13, cxx: /usr/bin/clang++-13 },
-            { name: Clang 14, cc: /usr/bin/clang-14, cxx: /usr/bin/clang++-14 },
+            { name: Clang 15, cc: /usr/bin/clang-15, cxx: /usr/bin/clang++-15 },
             { name: GCC 10, cc: /usr/bin/gcc-10, cxx: /usr/bin/g++-10 },
             # { name: GCC 11, cc: /usr/bin/gcc-11, cxx: /usr/bin/g++-11 }, # ? Not working yet, see https://github.com/boost-ext/sml/issues/546
             { name: GCC 12, cc: /usr/bin/gcc-12, cxx: /usr/bin/g++-12 },
+            { name: GCC 13, cc: /usr/bin/gcc-13, cxx: /usr/bin/g++-13 },
           ]
 
     steps:

diff --git a/tools/config/mbed_requirements.txt b/tools/config/mbed_requirements.txt
@@ -1,12 +1,16 @@
-PrettyTable<=1.0.1; python_version < '3.6'
-prettytable>=2.0,<3.0; python_version >= '3.6'
-future>=0.18.0,<1.0
-jinja2>=2.11.3
-intelhex>=2.3.0,<3.0.0
-mbed-tools
-mbed-os-tools
-pyelftools
+# Leka - LekaOS
+# Copyright 2020 APF France handicap
+# SPDX-License-Identifier: Apache-2.0
+
+# mbed-os tools dependencies
+prettytable==2.5.0
+future==0.18.3
+Jinja2==3.1.2
+intelhex==2.3.0
+mbed-tools==7.59.0
+mbed-os-tools==1.8.15
+pyelftools==0.30
 
 # needed for signing secure images
-cryptography
-cbor
+cryptography==41.0.7
+cbor==1.0.0