From 7dd2765eb715b7a9b7ad2ffc2597f02324dd755a Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Tue, 11 Feb 2025 14:50:51 -0300
Subject: [PATCH 1/2] ci(runners): Bump runner images version

---
 .github/workflows/build_py_tools.yml | 6 +++---
 .github/workflows/push.yml           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_py_tools.yml b/.github/workflows/build_py_tools.yml
index 48e7f2c82d3..250d18ab6c0 100644
--- a/.github/workflows/build_py_tools.yml
+++ b/.github/workflows/build_py_tools.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   find-changed-tools:
     name: Check if tools have been changed
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     outputs:
       any_changed: ${{ steps.verify-changed-files.outputs.any_changed }}
       all_changed_files: ${{ steps.verify-changed-files.outputs.all_changed_files }}
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, macos-latest, ubuntu-20.04, ARM]
+        os: [windows-latest, macos-latest, ubuntu-latest, ARM]
         include:
           - os: windows-latest
             TARGET: win64
@@ -64,7 +64,7 @@ jobs:
           - os: macos-latest
             TARGET: macos
             SEPARATOR: ":"
-          - os: ubuntu-20.04
+          - os: ubuntu-latest
             TARGET: linux-amd64
             SEPARATOR: ":"
           - os: ARM
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index bd5acfa7a40..211ed1658f9 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -237,7 +237,7 @@ jobs:
       needs.gen-chunks.outputs.build_all == 'true' ||
       needs.gen-chunks.outputs.build_libraries == 'true' ||
       needs.gen-chunks.outputs.build_idf == 'true'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:

From 2ae2b6577c3588b2d18757a9f994f531642d1276 Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Mon, 24 Feb 2025 11:57:06 -0300
Subject: [PATCH 2/2] ci(arm): Use github arm images

---
 .github/workflows/build_py_tools.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_py_tools.yml b/.github/workflows/build_py_tools.yml
index 250d18ab6c0..d4dfca9c8d1 100644
--- a/.github/workflows/build_py_tools.yml
+++ b/.github/workflows/build_py_tools.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, macos-latest, ubuntu-latest, ARM]
+        os: [windows-latest, macos-latest, ubuntu-latest, ubuntu-24.04-arm]
         include:
           - os: windows-latest
             TARGET: win64
@@ -67,11 +67,9 @@ jobs:
           - os: ubuntu-latest
             TARGET: linux-amd64
             SEPARATOR: ":"
-          - os: ARM
-            CONTAINER: python:3.8-bullseye
+          - os: ubuntu-24.04-arm
             TARGET: arm
             SEPARATOR: ":"
-    container: ${{ matrix.CONTAINER }} # use python container on ARM
     env:
       DISTPATH: pytools-${{ matrix.TARGET }}
       PIP_EXTRA_INDEX_URL: "https://dl.espressif.com/pypi"
@@ -96,8 +94,6 @@ jobs:
           token: ${{ secrets.TOOLS_UPLOAD_PAT }}
           ref: ${{ github.event.pull_request.head.ref }}
       - name: Set up Python 3.8
-        # Skip setting python on ARM because of missing compatibility: https://github.com/actions/setup-python/issues/108
-        if: matrix.os != 'ARM'
         uses: actions/setup-python@master
         with:
           python-version: 3.8