Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions support/docker/test/test_configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ test_gcc() {
assertArg 'BASE=$(DOCKER_REGISTRY)$(PROJECT)/base' 'PACKAGES="gcc g++"'
}

test_gcc_11() {
get_build_args gcc-11
assertArg 'BASE=$(DOCKER_REGISTRY)$(PROJECT)/base-debian' 'PACKAGES="gcc-11 g++-11"'
test_gcc_14() {
get_build_args gcc-14
assertArg 'BASE=$(DOCKER_REGISTRY)$(PROJECT)/base-debian' 'PACKAGES="gcc-14 g++-14"'
}

test_arm64_gcc() {
Expand Down
78 changes: 0 additions & 78 deletions support/docker/tuxmake-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -645,84 +645,6 @@ docker-images-clang_nightly_all-multiarch:
- if: '$CI_PIPELINE_SOURCE == "schedule" && ($TUXMAKE_DOCKER_IMAGES == "daily" || $TUXMAKE_DOCKER_IMAGES == "clang_nightly_all")'


docker-images-gcc_11_all-amd64:
stage: build
extends: .docker
variables:
TAG: "-amd64"
script:
- "make publish-gcc_11_all"
tags: [saas-linux-medium-amd64]
needs: ['docker-images-base-multiarch']
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && ($TUXMAKE_DOCKER_IMAGES == "monthly" || $TUXMAKE_DOCKER_IMAGES == "gcc_11_all")'


docker-images-gcc_11_all-arm64:
stage: build
extends: .docker
variables:
TAG: "-arm64"
script:
- "make publish-gcc_11_all"
tags: [saas-linux-medium-arm64]
needs: ['docker-images-base-multiarch']
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && ($TUXMAKE_DOCKER_IMAGES == "monthly" || $TUXMAKE_DOCKER_IMAGES == "gcc_11_all")'


docker-images-gcc_11_all-multiarch:
stage: publish
extends: .docker
variables:
DOCKER_CLI_EXPERIMENTAL: "enabled"
ARCH_TAGS: "-amd64 -arm64"
script:
- "make publish-multiarch-gcc_11_all"
needs: ['docker-images-gcc_11_all-amd64', 'docker-images-gcc_11_all-arm64']
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && ($TUXMAKE_DOCKER_IMAGES == "monthly" || $TUXMAKE_DOCKER_IMAGES == "gcc_11_all")'


docker-images-gcc_12_all-amd64:
stage: build
extends: .docker
variables:
TAG: "-amd64"
script:
- "make publish-gcc_12_all"
tags: [saas-linux-medium-amd64]
needs: ['docker-images-base-multiarch']
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && ($TUXMAKE_DOCKER_IMAGES == "monthly" || $TUXMAKE_DOCKER_IMAGES == "gcc_12_all")'


docker-images-gcc_12_all-arm64:
stage: build
extends: .docker
variables:
TAG: "-arm64"
script:
- "make publish-gcc_12_all"
tags: [saas-linux-medium-arm64]
needs: ['docker-images-base-multiarch']
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && ($TUXMAKE_DOCKER_IMAGES == "monthly" || $TUXMAKE_DOCKER_IMAGES == "gcc_12_all")'


docker-images-gcc_12_all-multiarch:
stage: publish
extends: .docker
variables:
DOCKER_CLI_EXPERIMENTAL: "enabled"
ARCH_TAGS: "-amd64 -arm64"
script:
- "make publish-multiarch-gcc_12_all"
needs: ['docker-images-gcc_12_all-amd64', 'docker-images-gcc_12_all-arm64']
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && ($TUXMAKE_DOCKER_IMAGES == "monthly" || $TUXMAKE_DOCKER_IMAGES == "gcc_12_all")'


docker-images-gcc_13_all-amd64:
stage: build
extends: .docker
Expand Down
5 changes: 4 additions & 1 deletion tuxmake/runtime/docker.ini
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ hosts = amd64, arm64
rebuild = monthly

[base-debian11]
skip_build = True
kind = base
base = docker.io/library/debian:bullseye-slim
hosts = amd64, arm64
Expand Down Expand Up @@ -134,7 +135,7 @@ hosts = amd64, arm64
rebuild = monthly
targets = x86_64, arm64, i386, arm, armhf, armv5, armel, mips, riscv, arc, parisc, powerpc, s390, sh, sparc
target_skip = arc
target_bases = riscv:gcc-12, arc:gcc-9
target_bases = riscv:gcc-13, arc:gcc-9
target_kinds = arc:arc
target_hosts = mips:amd64, arc:amd64, parisc:amd64, powerpc:amd64, s390:amd64, sh:amd64, sparc:amd64
packages = gcc, g++
Expand Down Expand Up @@ -175,6 +176,7 @@ rebuild = monthly
packages = gcc-10, g++-10

[gcc-11]
skip_build = True
kind = gcc-build
base = base-debian12
hosts = amd64, arm64
Expand All @@ -185,6 +187,7 @@ rebuild = monthly
packages = gcc-11, g++-11

[gcc-12]
skip_build = True

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets just drop instead of skip

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I kept skip_build on purpose. It matches what we already do for the other EOL toolchains: base-debian10, gcc-8, gcc-9 and gcc-10 are all kept with skip_build = True.

With skip_build CI stops rebuilding the image, but the toolchain stays defined. So users can still run tuxmake --toolchain gcc-12 and pull the last published image. Dropping the section removes that, and it would also be inconsistent with gcc-8/9/10.

The goal of this PR is just to stop building, so skip_build seems like the right fit. If you want a full cleanup instead, I am happy to drop gcc-11/gcc-12, but then we should drop gcc-8/9/10 and base-debian10 the same way to stay consistent.

kind = gcc-build
base = base-debian12
hosts = amd64, arm64
Expand Down
Loading