[ci] Upgrade to GCC 13.2

modm-io · Dec 1, 2024 · 7b0ae70 · 7b0ae70
1 parent 9e480a8
commit 7b0ae70
Show file tree

Hide file tree

Showing 12 changed files with 176 additions and 139 deletions.
diff --git a/.github/workflows/compile-all.yml b/.github/workflows/compile-all.yml
diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -8,9 +8,9 @@ on:
 
 jobs:
   build-upload-docs:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
-      image: ghcr.io/modm-ext/modm-build-base:2023-03-12
+      image: ghcr.io/modm-ext/modm-build-base:2024-12-01
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -21,7 +21,7 @@ jobs:
           git config --global --add safe.directory /__w/modm/modm
       - name: Update lbuild
         run: |
-          pip3 install --upgrade --upgrade-strategy=eager modm
+          pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
       - name: Mkdocs info
         run: |
           mkdocs --version
@@ -49,9 +49,9 @@ jobs:
 
   # Niklas: Running on the old container until I can figure out why the doc generator hangs
   api-docs-all:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     container:
-      image: ghcr.io/modm-ext/modm-build-base:2022-09-27
+      image: ghcr.io/modm-ext/modm-build-base:2024-12-01
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -62,7 +62,7 @@ jobs:
           git config --global --add safe.directory /__w/modm/modm
       - name: Update lbuild
         run: |
-          pip3 install --upgrade --upgrade-strategy=eager modm
+          pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
       - name: Full run of docs.modm.io-generator-script
         run: |
           export TERM=xterm-256color

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -4,9 +4,9 @@ on: [pull_request]
 
 jobs:
   unittests-linux-generic:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
-      image: ghcr.io/modm-ext/modm-build-cortex-m:2023-03-12
+      image: ghcr.io/modm-ext/modm-build-cortex-m:2024-12-01
 
     steps:
       - name: Check out repository
@@ -18,7 +18,7 @@ jobs:
           git config --global --add safe.directory /__w/modm/modm
       - name: Update lbuild
         run: |
-          pip3 install --upgrade --upgrade-strategy=eager modm
+          pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
       - name: Check environment
         run: |
           env
@@ -121,9 +121,9 @@ jobs:
           python3 tools/font_creator/font_export.py tools/font_creator/fonts/all_caps_3x5.font /tmp/all_caps_converted
 
   stm32-examples:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
-      image: ghcr.io/modm-ext/modm-build-cortex-m:2023-03-12
+      image: ghcr.io/modm-ext/modm-build-cortex-m:2024-12-01
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -134,7 +134,7 @@ jobs:
           git config --global --add safe.directory /__w/modm/modm
       - name: Update lbuild
         run: |
-          pip3 install --upgrade --upgrade-strategy=eager modm
+          pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
       - name: Examples STM32C0 Series
         if: always()
         run: |
@@ -189,9 +189,9 @@ jobs:
           (cd examples && ../tools/scripts/examples_compile.py nucleo_h743zi nucleo_h723zg stm32h750vbt6_devebox)
 
   stm32f4-examples-1:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
-      image: ghcr.io/modm-ext/modm-build-cortex-m:2023-03-12
+      image: ghcr.io/modm-ext/modm-build-cortex-m:2024-12-01
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -202,16 +202,16 @@ jobs:
           git config --global --add safe.directory /__w/modm/modm
       - name: Update lbuild
         run: |
-          pip3 install --upgrade --upgrade-strategy=eager modm
+          pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
       - name: Examples STM32F4 Only Discovery Board
         if: always()
         run: |
           (cd examples && ../tools/scripts/examples_compile.py stm32f4_discovery stm32f429_discovery stm32f469_discovery stm32f401_discovery)
 
   stm32f4-examples-2:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
-      image: ghcr.io/modm-ext/modm-build-cortex-m:2023-03-12
+      image: ghcr.io/modm-ext/modm-build-cortex-m:2024-12-01
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -222,19 +222,19 @@ jobs:
           git config --global --add safe.directory /__w/modm/modm
       - name: Update lbuild
         run: |
-          pip3 install --upgrade --upgrade-strategy=eager modm
+          pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
       - name: Install protobuf==3.20.1 grpcio-tools (pip)
         run: |
-          pip3 install --upgrade --upgrade-strategy=eager protobuf==3.20.1 grpcio-tools
+          pip3 install --upgrade --upgrade-strategy=eager --break-system-packages protobuf grpcio-tools
       - name: Examples STM32F4 Without Discovery Board
         if: always()
         run: |
           (cd examples && ../tools/scripts/examples_compile.py nucleo_f401re nucleo_f411re nucleo_f429zi nucleo_f446re nucleo_f446ze nucleo_f439zi black_pill_f401 black_pill_f411 stm32f407vet6_devebox stm32_f4ve)
 
   avr-examples:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
-      image: ghcr.io/modm-ext/modm-build-avr:2023-03-12
+      image: ghcr.io/modm-ext/modm-build-avr:2024-12-01
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -245,8 +245,9 @@ jobs:
           git config --global --add safe.directory /__w/modm/modm
       - name: Update lbuild
         run: |
-          pip3 install --upgrade --upgrade-strategy=eager modm
+          pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
       - name: Check environment
+        if: always()
         run: |
           which avr-g++
           avr-g++ --version
@@ -272,15 +273,16 @@ jobs:
         run: |
           (cd test/all && python3 run_all.py at --quick)
       - name: Upload log artifacts
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: hal-compile-quick-avr
           path: test/all/log
 
   hal-compile-quick-1:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
-      image: ghcr.io/modm-ext/modm-build-cortex-m:2023-03-12
+      image: ghcr.io/modm-ext/modm-build-cortex-m:2024-12-01
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -291,7 +293,7 @@ jobs:
           git config --global --add safe.directory /__w/modm/modm
       - name: Update lbuild
         run: |
-          pip3 install --upgrade --upgrade-strategy=eager modm
+          pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
       - name: Quick compile HAL for Cortex-M Part 1
         if: always()
         run: |
@@ -303,9 +305,9 @@ jobs:
           path: test/all/log
 
   hal-compile-quick-2:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
-      image: ghcr.io/modm-ext/modm-build-cortex-m:2023-03-12
+      image: ghcr.io/modm-ext/modm-build-cortex-m:2024-12-01
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -316,7 +318,7 @@ jobs:
           git config --global --add safe.directory /__w/modm/modm
       - name: Update lbuild
         run: |
-          pip3 install --upgrade --upgrade-strategy=eager modm
+          pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
       - name: Quick compile HAL for Cortex-M Part 2
         if: always()
         run: |
@@ -328,9 +330,9 @@ jobs:
           path: test/all/log
 
   hal-compile-quick-3:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
-      image: ghcr.io/modm-ext/modm-build-cortex-m:2023-03-12
+      image: ghcr.io/modm-ext/modm-build-cortex-m:2024-12-01
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -341,7 +343,7 @@ jobs:
           git config --global --add safe.directory /__w/modm/modm
       - name: Update lbuild
         run: |
-          pip3 install --upgrade --upgrade-strategy=eager modm
+          pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
       - name: Quick compile HAL for Cortex-M Part 3
         if: always()
         run: |
@@ -353,9 +355,9 @@ jobs:
           path: test/all/log
 
   hal-compile-quick-4:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
-      image: ghcr.io/modm-ext/modm-build-cortex-m:2023-03-12
+      image: ghcr.io/modm-ext/modm-build-cortex-m:2024-12-01
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -366,7 +368,7 @@ jobs:
           git config --global --add safe.directory /__w/modm/modm
       - name: Update lbuild
         run: |
-          pip3 install --upgrade --upgrade-strategy=eager modm
+          pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
       - name: Quick compile HAL for Cortex-M Part 4
         if: always()
         run: |
@@ -379,10 +381,10 @@ jobs:
 
   # Niklas: Running on the old container until I can figure out why the doc generator hangs
   build-docs-test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 30
     container:
-      image: ghcr.io/modm-ext/modm-build-base:2022-09-27
+      image: ghcr.io/modm-ext/modm-build-base:2024-12-01
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -393,10 +395,10 @@ jobs:
           git config --global --add safe.directory /__w/modm/modm
       - name: Update lbuild
         run: |
-          pip3 install --upgrade --upgrade-strategy=eager modm
+          pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
       - name: Install mkdocs mkdocs-material (pip)
         run: |
-          pip3 install --upgrade --upgrade-strategy=eager mkdocs mkdocs-material
+          pip3 install --upgrade --upgrade-strategy=eager --break-system-packages mkdocs mkdocs-material
           mkdocs --version
           pip3 show mkdocs-material
       - name: Test run of docs.modm.io-generator-script

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -13,27 +13,27 @@ jobs:
 
       - name: Setup environment - Brew tap
         run: |
-          brew tap modm-ext/arm
+          brew tap osx-cross/arm
           brew tap osx-cross/avr
 
       - name: Setup environment - Brew install
         run: |
           export HOMEBREW_NO_INSTALL_CLEANUP=1 # saves time
           brew update
           # brew unlink gcc
-          brew install doxygen boost gcc@12 avr-gcc@12 arm-gcc-bin@12 cmake || true
-          brew link --force avr-gcc@12
+          brew install doxygen boost gcc@13 avr-gcc@13 arm-gcc-bin@13 cmake || true
+          brew link --force avr-gcc@13 arm-gcc-bin@13
           # brew upgrade boost gcc git || true
 
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.12'
 
       - name: Setup environment - Python pip
         run: |
           pip3 install --user modm scons
           echo "/usr/local/bin" >> $GITHUB_PATH
-          echo "/Users/runner/Library/Python/3.11/bin" >> $GITHUB_PATH
+          echo "/Users/runner/Library/Python/3.12/bin" >> $GITHUB_PATH
 
       - name: Dump environment
         run: |

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -43,18 +43,18 @@ jobs:
           Start-Job {
             Set-Location $using:PWD
             Add-Type -Assembly "System.IO.Compression.Filesystem"
-            Invoke-WebRequest -OutFile gcc-win64.zip https://github.com/brechtsanders/winlibs_mingw/releases/download/12.2.0-15.0.6-10.0.0-msvcrt-r3/winlibs-x86_64-posix-seh-gcc-12.2.0-mingw-w64msvcrt-10.0.0-r3.zip
+            Invoke-WebRequest -OutFile gcc-win64.zip https://github.com/brechtsanders/winlibs_mingw/releases/download/13.2.0posix-18.1.5-11.0.1-msvcrt-r8/winlibs-x86_64-posix-seh-gcc-13.2.0-mingw-w64msvcrt-11.0.1-r8.zip
             [System.IO.Compression.ZipFile]::ExtractToDirectory("gcc-win64.zip", "C:\")
           }
           Start-Job {
             Set-Location $using:PWD
-            Invoke-WebRequest -OutFile gcc-arm-none-eabi-win64.zip https://developer.arm.com/-/media/Files/downloads/gnu/12.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1-mingw-w64-i686-arm-none-eabi.zip
+            Invoke-WebRequest -OutFile gcc-arm-none-eabi-win64.zip https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-mingw-w64-i686-arm-none-eabi.zip
             Expand-Archive -Path gcc-arm-none-eabi-win64.zip -DestinationPath C:\ -Force
           }
           Start-Job {
             Set-Location $using:PWD
             Add-Type -Assembly "System.IO.Compression.Filesystem"
-            Invoke-WebRequest -OutFile gcc-avr-win64.zip https://github.com/ZakKemble/avr-gcc-build/releases/download/v12.1.0-1/avr-gcc-12.1.0-x64-windows.zip
+            Invoke-WebRequest -OutFile gcc-avr-win64.zip https://github.com/ZakKemble/avr-gcc-build/releases/download/v13.2.0-1/avr-gcc-13.2.0-x64-windows.zip
             [System.IO.Compression.ZipFile]::ExtractToDirectory("gcc-avr-win64.zip", "C:\")
           }
           Get-Job | Wait-Job
@@ -65,11 +65,11 @@ jobs:
         run: |
           dir C:\
           dir C:\mingw64
-          dir C:\arm-gnu-toolchain-12.2.rel1-mingw-w64-i686-arm-none-eabi
-          dir C:\avr-gcc-12.1.0-x64-windows
+          dir C:\arm-gnu-toolchain-13.2.rel1-mingw-w64-i686-arm-none-eabi
+          dir C:\avr-gcc-13.2.0-x64-windows
           echo "C:\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-          echo "C:\arm-gnu-toolchain-12.2.rel1-mingw-w64-i686-arm-none-eabi\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-          echo "C:\avr-gcc-12.1.0-x64-windows\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          echo "C:\arm-gnu-toolchain-13.2.rel1-mingw-w64-i686-arm-none-eabi\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          echo "C:\avr-gcc-13.2.0-x64-windows\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
           rm gcc-arm-none-eabi-win64.zip
 
       - name: Install Python

diff --git a/ext/gcc/cabi_cortex.c b/ext/gcc/cabi_cortex.c
@@ -95,3 +95,10 @@ modm_weak int _gettimeofday(void *tp, void *tzp)
 	(void) tzp;
 	return -1;
 }
+
+modm_weak int _getentropy(void *buffer, size_t length)
+{
+	(void) buffer;
+	(void) length;
+	return -1;
+}
diff --git a/ext/lvgl/lvgl.lb b/ext/lvgl/lvgl.lb
@@ -85,6 +85,7 @@ def build(env):
     env.copy("lvgl/lvgl.h")
     env.copy("lvgl/lv_version.h")
     env.template("lv_conf.h.in")
-    env.copy("lvgl/src")
+    files = env.copy("lvgl/src")
+    env.collect(":build:ccflags", "-Wno-maybe-uninitialized", operations=files)
     env.substitutions = {"has_debug": env.has_module(":debug")}
     env.template("lv_modm_port.cpp.in")