Skip to contentSkip to conversation

CI: Update to gcc-13.2.0

PATCH In review Tom Rini 2 participants 7 messages Aug 25, 2023 – Aug 26, 2023

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/2 CI: Update to gcc-13.2.0

The latest kernel.org toolchains for gcc are now 13.2.0, so upgrade to that.

---
 .azure-pipelines.yml        |  2 +-
 .gitlab-ci.yml              |  2 +-
 tools/buildman/toolchain.py |  2 +-
 tools/docker/Dockerfile     | 58 ++++++++++++++++++-------------------
 4 files changed, 32 insertions(+), 32 deletions(-)
.azure-pipelines.yml +1 -1
index 0be317b38867..711b067c1f31 100644
@@ -195,7 +195,7 @@ stages:
           ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb nokia_rx51_tmp/
           ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb nokia_rx51_tmp/
           ln -s /opt/nokia/qemu-system-arm nokia_rx51_tmp/
-          export PATH=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin:$PATH
+          export PATH=/opt/gcc-13.2.0-nolibc/arm-linux-gnueabi/bin:$PATH
           test/nokia_rx51_test.sh
 
   - job: pylint
.gitlab-ci.yml +1 -1
index 5750d8202332..aff6a5c2dce1 100644
@@ -235,7 +235,7 @@ Run tests for Nokia RX-51 (aka N900):
       ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb nokia_rx51_tmp/;
       ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb nokia_rx51_tmp/;
       ln -s /opt/nokia/qemu-system-arm nokia_rx51_tmp/;
-      export PATH=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin:$PATH;
+      export PATH=/opt/gcc-13.2.0-nolibc/arm-linux-gnueabi/bin:$PATH;
       test/nokia_rx51_test.sh
 
 # Check for any pylint regressions
tools/buildman/toolchain.py +1 -1
index b05001194e42..79c7c11a1105 100644
@@ -499,7 +499,7 @@ class Toolchains:
         if arch == 'aarch64':
             arch = 'arm64'
         base = 'https://www.kernel.org/pub/tools/crosstool/files/bin'
-        versions = ['13.1.0', '12.2.0']
+        versions = ['13.2.0', '12.2.0']
         links = []
         for version in versions:
             url = '%s/%s/%s/' % (base, arch, version)
tools/docker/Dockerfile +29 -29

88 lines not on this page · raw message

Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 2/2 CI: Move to latest Ubuntu "Jammy" tag

Move to the latest "Jammy" tag from Ubuntu.

---
 .azure-pipelines.yml    | 2 +-
 .gitlab-ci.yml          | 2 +-
 tools/docker/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
.azure-pipelines.yml +1 -1
index 711b067c1f31..b9dce3b1cadf 100644
@@ -2,7 +2,7 @@ variables:
   windows_vm: windows-2019
   ubuntu_vm: ubuntu-22.04
   macos_vm: macOS-12
-  ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20230624-20Jul2023
+  ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20230804-24Aug2023
   # Add '-u 0' options for Azure pipelines, otherwise we get "permission
   # denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer",
   # since our $(ci_runner_image) user is not root.
.gitlab-ci.yml +1 -1
index aff6a5c2dce1..09b95fce41af 100644
@@ -10,7 +10,7 @@ default:
 
 # Grab our configured image.  The source for this is found
 # in the u-boot tree at tools/docker/Dockerfile
-image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20230624-20Jul2023
+image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20230804-24Aug2023
 
 # We run some tests in different order, to catch some failures quicker.
 stages:
tools/docker/Dockerfile +1 -1
index 93fe8c613244..9670f04eb5ee 100644
@@ -2,7 +2,7 @@
 # This Dockerfile is used to build an image containing basic stuff to be used
 # to build U-Boot and run our test suites.
 
-FROM ubuntu:jammy-20230624
+FROM ubuntu:jammy-20230804
 MAINTAINER Tom Rini <[email protected]>
 LABEL Description=" This image is for building U-Boot inside a container"
 
Signature · 1 line
2.34.1
Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] CI: Move to latest Ubuntu "Jammy" tag

Hi Tom,

Quoted 10 lines · Tom Rini

Move to the latest "Jammy" tag from Ubuntu.

---
 .azure-pipelines.yml    | 2 +-
 .gitlab-ci.yml          | 2 +-
 tools/docker/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

I wonder if they have a 'latest' tag? I suppose it wouldn't be safe to do this without trying it first, though.

Regards,
Simon

author
#3 lore raw

Re: [PATCH 2/2] CI: Move to latest Ubuntu "Jammy" tag

Quoted 14 lines · Simon Glass

Hi Tom,

Quoted 10 lines · Tom Rini

Move to the latest "Jammy" tag from Ubuntu.

---
 .azure-pipelines.yml    | 2 +-
 .gitlab-ci.yml          | 2 +-
 tools/docker/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
Quoted 4 lines

I wonder if they have a 'latest' tag? I suppose it wouldn't be safe to do this without trying it first, though.

Yes, but that would break reproducibility.

Signature · 1 line
Tom