From 57f6a3d9f6985942a46a733c28a25f3f79233352 Mon Sep 17 00:00:00 2001 From: Dmitriy Musatkin <63878209+DmitriyMusatkin@users.noreply.github.com> Date: Thu, 23 Jan 2025 13:14:07 -0800 Subject: [PATCH] Fix handling of gcc compiler default case (#317) --- .github/workflows/sanity-test.yml | 2 +- builder/core/data.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sanity-test.yml b/.github/workflows/sanity-test.yml index 61722b7f8..aae3d7ce1 100644 --- a/.github/workflows/sanity-test.yml +++ b/.github/workflows/sanity-test.yml @@ -297,7 +297,7 @@ jobs: - musllinux-1-1-x64 needs: package - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 # temporarily downgrade to old ubuntu as 24.04 likes to segfault in the middle of the build steps: - uses: aws-actions/configure-aws-credentials@v4 with: diff --git a/builder/core/data.py b/builder/core/data.py index 46b570e51..2ce27aea3 100644 --- a/builder/core/data.py +++ b/builder/core/data.py @@ -572,6 +572,12 @@ class PKG_TOOLS(Enum): 'yum_compiler_packages': ['gcc', 'gcc-c++'], 'versions': { + 'default': { + '!c': "gcc", + '!cxx': "g++", + '!compiler_packages': [], + '!apt_compiler_packages': [], + }, '4.8': { # ASan has been broken on 4.8 GCC version distributed on Ubuntu # and will unlikely to get fixed upstream. so turn it off.