Integrated: 8293098: GHA: Harmonize GCC version handling for host and cross builds

Aleksey Shipilev shade at openjdk.org
Wed Aug 31 05:32:41 UTC 2022


On Tue, 30 Aug 2022 13:35:21 GMT, Aleksey Shipilev <shade at openjdk.org> wrote:

> Caught this headache while trying to bump to Ubuntu 22.04, which required touching way too many surprising places. 
> 
> Current GHA scripts define `apt-gcc-version` a bit weirdly: host and cross builds version differ in carrying the "gcc-major-version" inside of it. That is, "host" builds do `apt-gcc-version: '10=10.3.0-1ubuntu1~20.04'`, while cross builds do `apt-gcc-version: default: '10.3.0-1ubuntu1~20.04'`
> 
> I propose we harmonize these to simplify GCC updates: split out the `gcc-major-version` for host builds, and pull the versions from cross builds into `main`, where all other versions belong. Additionally, this handles the x86_32 case that requires "-multilib" package, which is currently hacked through the "version" string.
> 
> Additional testing:
>  - [ ] GHA

This pull request has now been integrated.

Changeset: 923c952b
Author:    Aleksey Shipilev <shade at openjdk.org>
URL:       https://git.openjdk.org/jdk/commit/923c952bec3935d8b1bf8ee3cf3352ca1f965469
Stats:     37 lines in 3 files changed: 18 ins; 3 del; 16 mod

8293098: GHA: Harmonize GCC version handling for host and cross builds

Reviewed-by: ihse, clanger

-------------

PR: https://git.openjdk.org/jdk/pull/10083



More information about the build-dev mailing list