Skip to content

Commit 0588172

Browse files
salkiniumsalkinium
committed
[ci] Upgrade to GCC 13.2
1 parent 60eba38 commit 0588172

File tree

13 files changed

+187
-162
lines changed

13 files changed

+187
-162
lines changed

‎.github/workflows/compile-all.yml‎

Lines changed: 84 additions & 84 deletions
Large diffs are not rendered by default.

‎.github/workflows/deploy-docs.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ on:
88

99
jobs:
1010
build-upload-docs:
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-24.04
1212
container:
13-
image: ghcr.io/modm-ext/modm-build-base:2023-03-12
13+
image: ghcr.io/modm-ext/modm-build-base:2024-12-01
1414
steps:
1515
- name: Check out repository
1616
uses: actions/checkout@v4
@@ -21,7 +21,7 @@ jobs:
2121
git config --global --add safe.directory /__w/modm/modm
2222
- name: Update lbuild
2323
run: |
24-
pip3 install --upgrade --upgrade-strategy=eager modm
24+
pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
2525
- name: Mkdocs info
2626
run: |
2727
mkdocs --version
@@ -49,9 +49,9 @@ jobs:
4949
5050
# Niklas: Running on the old container until I can figure out why the doc generator hangs
5151
api-docs-all:
52-
runs-on: ubuntu-20.04
52+
runs-on: ubuntu-24.04
5353
container:
54-
image: ghcr.io/modm-ext/modm-build-base:2022-09-27
54+
image: ghcr.io/modm-ext/modm-build-base:2024-12-01
5555
steps:
5656
- name: Check out repository
5757
uses: actions/checkout@v4
@@ -62,7 +62,7 @@ jobs:
6262
git config --global --add safe.directory /__w/modm/modm
6363
- name: Update lbuild
6464
run: |
65-
pip3 install --upgrade --upgrade-strategy=eager modm
65+
pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
6666
- name: Full run of docs.modm.io-generator-script
6767
run: |
6868
export TERM=xterm-256color

‎.github/workflows/linux.yml‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on: [pull_request]
44

55
jobs:
66
unittests-linux-generic:
7-
runs-on: ubuntu-22.04
7+
runs-on: ubuntu-24.04
88
container:
9-
image: ghcr.io/modm-ext/modm-build-cortex-m:2023-03-12
9+
image: ghcr.io/modm-ext/modm-build-cortex-m:2024-12-01
1010

1111
steps:
1212
- name: Check out repository
@@ -18,7 +18,7 @@ jobs:
1818
git config --global --add safe.directory /__w/modm/modm
1919
- name: Update lbuild
2020
run: |
21-
pip3 install --upgrade --upgrade-strategy=eager modm
21+
pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
2222
- name: Check environment
2323
run: |
2424
env
@@ -121,9 +121,9 @@ jobs:
121121
python3 tools/font_creator/font_export.py tools/font_creator/fonts/all_caps_3x5.font /tmp/all_caps_converted
122122
123123
stm32-examples:
124-
runs-on: ubuntu-22.04
124+
runs-on: ubuntu-24.04
125125
container:
126-
image: ghcr.io/modm-ext/modm-build-cortex-m:2023-03-12
126+
image: ghcr.io/modm-ext/modm-build-cortex-m:2024-12-01
127127
steps:
128128
- name: Check out repository
129129
uses: actions/checkout@v4
@@ -134,7 +134,7 @@ jobs:
134134
git config --global --add safe.directory /__w/modm/modm
135135
- name: Update lbuild
136136
run: |
137-
pip3 install --upgrade --upgrade-strategy=eager modm
137+
pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
138138
- name: Examples STM32C0 Series
139139
if: always()
140140
run: |
@@ -189,9 +189,9 @@ jobs:
189189
(cd examples && ../tools/scripts/examples_compile.py nucleo_h743zi nucleo_h723zg stm32h750vbt6_devebox)
190190
191191
stm32f4-examples-1:
192-
runs-on: ubuntu-22.04
192+
runs-on: ubuntu-24.04
193193
container:
194-
image: ghcr.io/modm-ext/modm-build-cortex-m:2023-03-12
194+
image: ghcr.io/modm-ext/modm-build-cortex-m:2024-12-01
195195
steps:
196196
- name: Check out repository
197197
uses: actions/checkout@v4
@@ -202,16 +202,16 @@ jobs:
202202
git config --global --add safe.directory /__w/modm/modm
203203
- name: Update lbuild
204204
run: |
205-
pip3 install --upgrade --upgrade-strategy=eager modm
205+
pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
206206
- name: Examples STM32F4 Only Discovery Board
207207
if: always()
208208
run: |
209209
(cd examples && ../tools/scripts/examples_compile.py stm32f4_discovery stm32f429_discovery stm32f469_discovery stm32f401_discovery)
210210
211211
stm32f4-examples-2:
212-
runs-on: ubuntu-22.04
212+
runs-on: ubuntu-24.04
213213
container:
214-
image: ghcr.io/modm-ext/modm-build-cortex-m:2023-03-12
214+
image: ghcr.io/modm-ext/modm-build-cortex-m:2024-12-01
215215
steps:
216216
- name: Check out repository
217217
uses: actions/checkout@v4
@@ -222,19 +222,19 @@ jobs:
222222
git config --global --add safe.directory /__w/modm/modm
223223
- name: Update lbuild
224224
run: |
225-
pip3 install --upgrade --upgrade-strategy=eager modm
225+
pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
226226
- name: Install protobuf==3.20.1 grpcio-tools (pip)
227227
run: |
228-
pip3 install --upgrade --upgrade-strategy=eager protobuf==3.20.1 grpcio-tools
228+
pip3 install --upgrade --upgrade-strategy=eager --break-system-packages protobuf grpcio-tools
229229
- name: Examples STM32F4 Without Discovery Board
230230
if: always()
231231
run: |
232232
(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)
233233
234234
avr-examples:
235-
runs-on: ubuntu-22.04
235+
runs-on: ubuntu-24.04
236236
container:
237-
image: ghcr.io/modm-ext/modm-build-avr:2023-03-12
237+
image: ghcr.io/modm-ext/modm-build-avr:2024-12-01
238238
steps:
239239
- name: Check out repository
240240
uses: actions/checkout@v4
@@ -245,8 +245,9 @@ jobs:
245245
git config --global --add safe.directory /__w/modm/modm
246246
- name: Update lbuild
247247
run: |
248-
pip3 install --upgrade --upgrade-strategy=eager modm
248+
pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
249249
- name: Check environment
250+
if: always()
250251
run: |
251252
which avr-g++
252253
avr-g++ --version
@@ -272,15 +273,16 @@ jobs:
272273
run: |
273274
(cd test/all && python3 run_all.py at --quick)
274275
- name: Upload log artifacts
276+
if: always()
275277
uses: actions/upload-artifact@v4
276278
with:
277279
name: hal-compile-quick-avr
278280
path: test/all/log
279281

280282
hal-compile-quick-1:
281-
runs-on: ubuntu-22.04
283+
runs-on: ubuntu-24.04
282284
container:
283-
image: ghcr.io/modm-ext/modm-build-cortex-m:2023-03-12
285+
image: ghcr.io/modm-ext/modm-build-cortex-m:2024-12-01
284286
steps:
285287
- name: Check out repository
286288
uses: actions/checkout@v4
@@ -291,7 +293,7 @@ jobs:
291293
git config --global --add safe.directory /__w/modm/modm
292294
- name: Update lbuild
293295
run: |
294-
pip3 install --upgrade --upgrade-strategy=eager modm
296+
pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
295297
- name: Quick compile HAL for Cortex-M Part 1
296298
if: always()
297299
run: |
@@ -303,9 +305,9 @@ jobs:
303305
path: test/all/log
304306

305307
hal-compile-quick-2:
306-
runs-on: ubuntu-22.04
308+
runs-on: ubuntu-24.04
307309
container:
308-
image: ghcr.io/modm-ext/modm-build-cortex-m:2023-03-12
310+
image: ghcr.io/modm-ext/modm-build-cortex-m:2024-12-01
309311
steps:
310312
- name: Check out repository
311313
uses: actions/checkout@v4
@@ -316,7 +318,7 @@ jobs:
316318
git config --global --add safe.directory /__w/modm/modm
317319
- name: Update lbuild
318320
run: |
319-
pip3 install --upgrade --upgrade-strategy=eager modm
321+
pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
320322
- name: Quick compile HAL for Cortex-M Part 2
321323
if: always()
322324
run: |
@@ -328,9 +330,9 @@ jobs:
328330
path: test/all/log
329331

330332
hal-compile-quick-3:
331-
runs-on: ubuntu-22.04
333+
runs-on: ubuntu-24.04
332334
container:
333-
image: ghcr.io/modm-ext/modm-build-cortex-m:2023-03-12
335+
image: ghcr.io/modm-ext/modm-build-cortex-m:2024-12-01
334336
steps:
335337
- name: Check out repository
336338
uses: actions/checkout@v4
@@ -341,7 +343,7 @@ jobs:
341343
git config --global --add safe.directory /__w/modm/modm
342344
- name: Update lbuild
343345
run: |
344-
pip3 install --upgrade --upgrade-strategy=eager modm
346+
pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
345347
- name: Quick compile HAL for Cortex-M Part 3
346348
if: always()
347349
run: |
@@ -353,9 +355,9 @@ jobs:
353355
path: test/all/log
354356

355357
hal-compile-quick-4:
356-
runs-on: ubuntu-22.04
358+
runs-on: ubuntu-24.04
357359
container:
358-
image: ghcr.io/modm-ext/modm-build-cortex-m:2023-03-12
360+
image: ghcr.io/modm-ext/modm-build-cortex-m:2024-12-01
359361
steps:
360362
- name: Check out repository
361363
uses: actions/checkout@v4
@@ -366,7 +368,7 @@ jobs:
366368
git config --global --add safe.directory /__w/modm/modm
367369
- name: Update lbuild
368370
run: |
369-
pip3 install --upgrade --upgrade-strategy=eager modm
371+
pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm
370372
- name: Quick compile HAL for Cortex-M Part 4
371373
if: always()
372374
run: |

‎.github/workflows/macos.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,27 @@ jobs:
1313

1414
- name: Setup environment - Brew tap
1515
run: |
16-
brew tap modm-ext/arm
16+
brew tap osx-cross/arm
1717
brew tap osx-cross/avr
1818
1919
- name: Setup environment - Brew install
2020
run: |
2121
export HOMEBREW_NO_INSTALL_CLEANUP=1 # saves time
2222
brew update
2323
# brew unlink gcc
24-
brew install doxygen boost gcc@12 avr-gcc@12 arm-gcc-bin@12 cmake || true
25-
brew link --force avr-gcc@12
24+
brew install doxygen boost gcc@13 avr-gcc@13 arm-gcc-bin@13 cmake || true
25+
brew link --force avr-gcc@13 arm-gcc-bin@13
2626
# brew upgrade boost gcc git || true
2727
2828
- uses: actions/setup-python@v5
2929
with:
30-
python-version: '3.11'
30+
python-version: '3.12'
3131

3232
- name: Setup environment - Python pip
3333
run: |
3434
pip3 install --user modm scons
3535
echo "/usr/local/bin" >> $GITHUB_PATH
36-
echo "/Users/runner/Library/Python/3.11/bin" >> $GITHUB_PATH
36+
echo "/Users/runner/Library/Python/3.12/bin" >> $GITHUB_PATH
3737
3838
- name: Dump environment
3939
run: |

‎.github/workflows/windows.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,18 @@ jobs:
4343
Start-Job {
4444
Set-Location $using:PWD
4545
Add-Type -Assembly "System.IO.Compression.Filesystem"
46-
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
46+
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
4747
[System.IO.Compression.ZipFile]::ExtractToDirectory("gcc-win64.zip", "C:\")
4848
}
4949
Start-Job {
5050
Set-Location $using:PWD
51-
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
51+
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
5252
Expand-Archive -Path gcc-arm-none-eabi-win64.zip -DestinationPath C:\ -Force
5353
}
5454
Start-Job {
5555
Set-Location $using:PWD
5656
Add-Type -Assembly "System.IO.Compression.Filesystem"
57-
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
57+
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
5858
[System.IO.Compression.ZipFile]::ExtractToDirectory("gcc-avr-win64.zip", "C:\")
5959
}
6060
Get-Job | Wait-Job
@@ -65,11 +65,11 @@ jobs:
6565
run: |
6666
dir C:\
6767
dir C:\mingw64
68-
dir C:\arm-gnu-toolchain-12.2.rel1-mingw-w64-i686-arm-none-eabi
69-
dir C:\avr-gcc-12.1.0-x64-windows
68+
dir C:\arm-gnu-toolchain-13.2.rel1-mingw-w64-i686-arm-none-eabi
69+
dir C:\avr-gcc-13.2.0-x64-windows
7070
echo "C:\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
71-
echo "C:\arm-gnu-toolchain-12.2.rel1-mingw-w64-i686-arm-none-eabi\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
72-
echo "C:\avr-gcc-12.1.0-x64-windows\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
71+
echo "C:\arm-gnu-toolchain-13.2.rel1-mingw-w64-i686-arm-none-eabi\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
72+
echo "C:\avr-gcc-13.2.0-x64-windows\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
7373
rm gcc-arm-none-eabi-win64.zip
7474
7575
- name: Install Python

0 commit comments

Comments
 (0)