Skip to content

Add cc builds for debian13 #1886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
loosebazooka merged 1 commit into from
Oct 8, 2025
Merged

Add cc builds for debian13 #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,14 @@ CC |= {
"{REGISTRY}/{PROJECT_ID}/cc-" + distro + ":" + tag_base + "-" + arch: "//cc:" + label + "_" + user + "_" + arch + "_" + distro
for arch in ARCHITECTURES
for (tag_base, label, user) in CC_VARIANTS
for distro in DISTROS
for distro in DISTROS + PREVIEW_DISTROS
}

# oci_image_index
CC |= {
"{REGISTRY}/{PROJECT_ID}/cc-" + distro + ":" + tag_base: "//cc:" + label + "_" + user + "_" + distro
for (tag_base, label, user) in CC_VARIANTS
for distro in DISTROS
for distro in DISTROS + PREVIEW_DISTROS
}

## PYTHON3
Expand Down
4 changes: 2 additions & 2 deletions MODULE.bazel.lock
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 13 additions & 4 deletions cc/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
load("@rules_oci//oci:defs.bzl", "oci_image", "oci_image_index")
load("//:checksums.bzl", "ARCHITECTURES")
load("//base:distro.bzl", "DISTROS")
load("//base:distro.bzl", "DISTROS", "PREVIEW_DISTROS")
load("//private/util:deb.bzl", "deb")

package(default_visibility = ["//visibility:public"])

GCC_BASE = {
"debian12": "gcc-12-base",
"debian13": "gcc-14-base",
}

# An image for C/C++ programs
[
oci_image_index(
Expand All @@ -22,15 +27,19 @@ package(default_visibility = ["//visibility:public"])
"root",
"nonroot",
]
for distro in DISTROS
for distro in DISTROS + PREVIEW_DISTROS
]

[
oci_image(
name = ("cc" if (not mode) else mode[1:]) + "_" + user + "_" + arch + "_" + distro,
base = "//base" + (mode if mode else ":base") + "_" + user + "_" + arch + "_" + distro,
tars = [
deb.package(arch, distro, "gcc-12-base"),
deb.package(
arch,
distro,
GCC_BASE[distro],
),
deb.package(arch, distro, "libgomp1"),
deb.package(arch, distro, "libstdc++6"),
deb.package(arch, distro, "libgcc-s1"),
Expand All @@ -45,5 +54,5 @@ package(default_visibility = ["//visibility:public"])
"root",
"nonroot",
]
for distro in DISTROS
for distro in DISTROS + PREVIEW_DISTROS
]
50 changes: 25 additions & 25 deletions private/repos/deb/trixie.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,13 @@
{
"arch": "amd64",
"dependencies": [],
"key": "gcc-12-base_12.4.0-5_amd64",
"name": "gcc-12-base",
"sha256": "df84249e59643841cd2ccc7faec7c836da4c567520d76d5b5e380d2a8f7aa30b",
"key": "gcc-14-base_14.2.0-19_amd64",
"name": "gcc-14-base",
"sha256": "5b6825de4263824b78c4c51f6476414f3b4e89c2ab63e81dc8b9b5501e867cf6",
"urls": [
"https://snapshot.debian.org/archive/debian/20251001T203719Z/pool/main/g/gcc-12/gcc-12-base_12.4.0-5_amd64.deb"
"https://snapshot.debian.org/archive/debian/20251001T203719Z/pool/main/g/gcc-14/gcc-14-base_14.2.0-19_amd64.deb"
],
"version": "12.4.0-5"
"version": "14.2.0-19"
},
{
"arch": "amd64",
Expand Down Expand Up @@ -245,13 +245,13 @@
{
"arch": "arm64",
"dependencies": [],
"key": "gcc-12-base_12.4.0-5_arm64",
"name": "gcc-12-base",
"sha256": "df5b56a2e55197bc7944a95103ab4c2a886ab53b6f5cafd7e5ce9a312c3a0f40",
"key": "gcc-14-base_14.2.0-19_arm64",
"name": "gcc-14-base",
"sha256": "34ee90679b018c0e64234747a4c4c0ae6b7f63541115037465a8627c2dfbc594",
"urls": [
"https://snapshot.debian.org/archive/debian/20251001T203719Z/pool/main/g/gcc-12/gcc-12-base_12.4.0-5_arm64.deb"
"https://snapshot.debian.org/archive/debian/20251001T203719Z/pool/main/g/gcc-14/gcc-14-base_14.2.0-19_arm64.deb"
],
"version": "12.4.0-5"
"version": "14.2.0-19"
},
{
"arch": "arm64",
Expand Down Expand Up @@ -388,13 +388,13 @@
{
"arch": "armhf",
"dependencies": [],
"key": "gcc-12-base_12.4.0-5_armhf",
"name": "gcc-12-base",
"sha256": "da9ae9b45aa56a77230d78a4c246ed7fba09300a2666509b258a6c1a07880e9b",
"key": "gcc-14-base_14.2.0-19_armhf",
"name": "gcc-14-base",
"sha256": "0f702fdd5e5471efda9fece892e09ce73e3447968083e1f8c341f8b66b1fb340",
"urls": [
"https://snapshot.debian.org/archive/debian/20251001T203719Z/pool/main/g/gcc-12/gcc-12-base_12.4.0-5_armhf.deb"
"https://snapshot.debian.org/archive/debian/20251001T203719Z/pool/main/g/gcc-14/gcc-14-base_14.2.0-19_armhf.deb"
],
"version": "12.4.0-5"
"version": "14.2.0-19"
},
{
"arch": "armhf",
Expand Down Expand Up @@ -531,13 +531,13 @@
{
"arch": "s390x",
"dependencies": [],
"key": "gcc-12-base_12.4.0-5_s390x",
"name": "gcc-12-base",
"sha256": "d6ed8f87bd781f4fe9912d1e4a6689321066980f8ac7f920bc894d50129f7e28",
"key": "gcc-14-base_14.2.0-19_s390x",
"name": "gcc-14-base",
"sha256": "7db20fd710eadefff128e82b4d4de68b466ce2aa1c53255004eb1d3d1d168495",
"urls": [
"https://snapshot.debian.org/archive/debian/20251001T203719Z/pool/main/g/gcc-12/gcc-12-base_12.4.0-5_s390x.deb"
"https://snapshot.debian.org/archive/debian/20251001T203719Z/pool/main/g/gcc-14/gcc-14-base_14.2.0-19_s390x.deb"
],
"version": "12.4.0-5"
"version": "14.2.0-19"
},
{
"arch": "s390x",
Expand Down Expand Up @@ -674,13 +674,13 @@
{
"arch": "ppc64el",
"dependencies": [],
"key": "gcc-12-base_12.4.0-5_ppc64el",
"name": "gcc-12-base",
"sha256": "30cb4d16c260634daada2ed34a19f2920bbd7172c0acce1000b37abb00435ac9",
"key": "gcc-14-base_14.2.0-19_ppc64el",
"name": "gcc-14-base",
"sha256": "ebb80291fedd8db88488eef76573df0b4a1a11648a16406d9a0c0d4aaf229593",
"urls": [
"https://snapshot.debian.org/archive/debian/20251001T203719Z/pool/main/g/gcc-12/gcc-12-base_12.4.0-5_ppc64el.deb"
"https://snapshot.debian.org/archive/debian/20251001T203719Z/pool/main/g/gcc-14/gcc-14-base_14.2.0-19_ppc64el.deb"
],
"version": "12.4.0-5"
"version": "14.2.0-19"
},
{
"arch": "ppc64el",
Expand Down
2 changes: 1 addition & 1 deletion private/repos/deb/trixie.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ packages:
- tzdata
- media-types
# c++
- gcc-12-base
- gcc-14-base
- libgcc-s1
- libgomp1
- libstdc++6
Loading