From e71da4dfedfded1553e3b9cb0fb178c69ea72d99 Mon Sep 17 00:00:00 2001 From: Ramon Roche Date: Thu, 9 Jan 2025 12:12:36 -0800 Subject: [PATCH 1/3] setup: set gcc 13.2 --- Tools/setup/ubuntu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/setup/ubuntu.sh b/Tools/setup/ubuntu.sh index 434b2a81cd09..4d2e1402b97d 100755 --- a/Tools/setup/ubuntu.sh +++ b/Tools/setup/ubuntu.sh @@ -118,7 +118,7 @@ if [[ $INSTALL_NUTTX == "true" ]]; then build-essential \ flex \ g++-multilib \ - gcc-arm-none-eabi \ + gcc-arm-none-eabi=15:13.2.rel1-2 \ gcc-multilib \ gdb-multiarch \ genromfs \ From e4f16e8561cda98112bee8098e1964224a602b9e Mon Sep 17 00:00:00 2001 From: Ramon Roche Date: Wed, 15 Jan 2025 08:42:46 -0800 Subject: [PATCH 2/3] releases: make sure we build using Ubuntu LTS --- .github/workflows/build_all_targets.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_all_targets.yml b/.github/workflows/build_all_targets.yml index e6d0ece2897a..3456887e5130 100644 --- a/.github/workflows/build_all_targets.yml +++ b/.github/workflows/build_all_targets.yml @@ -22,7 +22,7 @@ jobs: group_targets: name: Scan for Board Targets # runs-on: ubuntu-latest - runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false] + runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false] outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} timestamp: ${{ steps.set-timestamp.outputs.timestamp }} @@ -59,7 +59,7 @@ jobs: setup: name: Build Group [${{ matrix.group }}] # runs-on: ubuntu-latest - runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false] + runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false] needs: group_targets strategy: matrix: ${{ fromJson(needs.group_targets.outputs.matrix) }} @@ -112,7 +112,7 @@ jobs: artifacts: name: Upload Artifacts to S3 # runs-on: ubuntu-latest - runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false] + runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false] needs: [setup, group_targets] if: contains(fromJSON('["main", "stable", "beta"]'), needs.group_targets.outputs.branchname) steps: @@ -141,7 +141,7 @@ jobs: release: name: Create Release and Upload Artifacts # runs-on: ubuntu-latest - runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false] + runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false] needs: [setup, group_targets] if: startsWith(github.ref, 'refs/tags/v') steps: From 8670f6cc7b599c530e5860db0c024dc1e9894cc5 Mon Sep 17 00:00:00 2001 From: Ramon Roche Date: Wed, 15 Jan 2025 08:43:27 -0800 Subject: [PATCH 3/3] ci: add future ubuntu versions to build matrix --- .github/workflows/compile_ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/compile_ubuntu.yml b/.github/workflows/compile_ubuntu.yml index 31d1a1e53711..f54f35fe373b 100644 --- a/.github/workflows/compile_ubuntu.yml +++ b/.github/workflows/compile_ubuntu.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - version: ['ubuntu:22.04', 'ubuntu:24.04'] + version: ['ubuntu:22.04', 'ubuntu:24.04', 'ubuntu:25.04'] runs-on: [runs-on,runner=8cpu-linux-x64,"image=ubuntu24-full-x64","run-id=${{ github.run_id }}",spot=false] container: image: ${{ matrix.version }}