diff options
| -rw-r--r-- | .github/workflows/build.yml | 15 | ||||
| -rw-r--r-- | README.md | 9 | ||||
| -rwxr-xr-x | deploy-manifests.sh | 25 | ||||
| -rw-r--r-- | python.Dockerfile | 11 |
4 files changed, 52 insertions, 8 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7491b9f..163d13a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,8 +18,11 @@ jobs: target: - python - stage3-amd64-hardened-openrc + - stage3-amd64-llvm-openrc + - stage3-amd64-llvm-systemd - stage3-amd64-musl - stage3-amd64-musl-hardened + - stage3-amd64-musl-llvm - stage3-amd64-nomultilib-openrc - stage3-amd64-nomultilib-systemd - stage3-amd64-openrc @@ -39,14 +42,19 @@ jobs: - stage3-armv7a_hardfp-systemd - stage3-arm64-desktop-openrc - stage3-arm64-desktop-systemd + - stage3-arm64-llvm-openrc + - stage3-arm64-llvm-systemd - stage3-arm64-musl - stage3-arm64-musl-hardened + - stage3-arm64-musl-llvm - stage3-arm64-openrc - stage3-arm64-systemd - stage3-i686-hardened-openrc - stage3-i686-musl - stage3-i686-openrc - stage3-i686-systemd + - stage3-i686-ssemath-t64-openrc + - stage3-i686-ssemath-t64-systemd - stage3-ppc64le-musl-hardened-openrc - stage3-ppc64le-openrc - stage3-ppc64le-systemd @@ -79,11 +87,18 @@ jobs: - stage3:latest - stage3:desktop - stage3:hardened + - stage3:llvm + - stage3:llvm-systemd - stage3:musl - stage3:musl-hardened + - stage3:musl-llvm - stage3:nomultilib - stage3:nomultilib-systemd + - stage3:ssemath-t64 + - stage3:ssemath-t64-systemd - stage3:systemd + - stage3:t64 + - stage3:t64-systemd name: ${{ matrix.target }} runs-on: ubuntu-latest steps: @@ -18,10 +18,12 @@ The following targets are built and pushed to Docker Hub: * `portage` * `stage3` * `amd64` - * `stage3-amd64-hardened-nomultilib-openrc` * `stage3-amd64-hardened-openrc` + * `stage3-amd64-llvm-openrc` + * `stage3-amd64-llvm-systemd` * `stage3-amd64-musl` * `stage3-amd64-musl-hardened` + * `stage3-amd64-musl-llvm` * `stage3-amd64-nomultilib-openrc` * `stage3-amd64-nomultilib-systemd` * `stage3-amd64-openrc` @@ -43,8 +45,11 @@ The following targets are built and pushed to Docker Hub: * `arm64` * `stage3-arm64-desktop-openrc` * `stage3-arm64-desktop-systemd` + * `stage3-arm64-llvm-openrc` + * `stage3-arm64-llvm-systemd` * `stage3-arm64-musl` * `stage3-arm64-musl-hardened` + * `stage3-arm64-musl-llvm` * `stage3-arm64-openrc` * `stage3-arm64-systemd` * `ppc` @@ -62,6 +67,8 @@ The following targets are built and pushed to Docker Hub: * `stage3-i686-hardened-openrc` * `stage3-i686-musl` * `stage3-i686-openrc` + * `stage3-i686-ssemath-t64-openrc` + * `stage3-i686-ssemath-t64-systemd` * `stage3-i686-systemd` The following upstream stage3 targets are not built at all: diff --git a/deploy-manifests.sh b/deploy-manifests.sh index 37b735b..ffe498e 100755 --- a/deploy-manifests.sh +++ b/deploy-manifests.sh @@ -24,21 +24,42 @@ case "${TARGET}" in "stage3:hardened") TAGS=("amd64-hardened-openrc" "i686-hardened-openrc") ;; + "stage3:llvm") + TAGS=("amd64-llvm-openrc" "arm64-llvm-openrc") + ;; + "stage3:llvm-systemd") + TAGS=("amd64-llvm-systemd" "arm64-llvm-systemd") + ;; "stage3:musl") TAGS=("amd64-musl" "armv7a_hardfp_musl-openrc" "arm64-musl" "i686-musl") ;; "stage3:musl-hardened") TAGS=("amd64-musl-hardened" "arm64-musl-hardened" "ppc64le-musl-hardened-openrc") ;; + "stage3:musl-llvm") + TAGS=("amd64-musl-llvm" "arm64-musl-llvm") + ;; "stage3:nomultilib") - TAGS=("amd64-nomultilib-openrc") + TAGS=("amd64-nomultilib-openrc" "armv5tel-openrc" "armv6j_hardfp-openrc" "armv7a_hardfp-openrc" "arm64-openrc" "i686-openrc" "ppc64le-openrc" "rv64_lp64d-openrc" "s390x") ;; "stage3:nomultilib-systemd") - TAGS=("amd64-nomultilib-systemd") + TAGS=("amd64-nomultilib-systemd" "armv5tel-systemd" "armv6j_hardfp-systemd" "armv7a_hardfp-systemd" "arm64-systemd" "i686-systemd" "ppc64le-systemd" "rv64_lp64d-systemd") + ;; + "stage3:ssemath-t64") + TAGS=("i686-ssemath-t64-openrc") + ;; + "stage3:ssemath-t64-systemd") + TAGS=("i686-ssemath-t64-systemd") ;; "stage3:systemd") TAGS=("amd64-systemd" "armv5tel-systemd" "armv6j_hardfp-systemd" "armv7a_hardfp-systemd" "arm64-systemd" "i686-systemd" "ppc64le-systemd" "rv64_lp64d-systemd") ;; + "stage3:t64") + TAGS=("amd64-openrc" "arm64-openrc" "i686-ssemath-t64-openrc" "ppc64le-openrc" "rv64_lp64d-openrc" "s390x") + ;; + "stage3:t64-systemd") + TAGS=("amd64-systemd" "arm64-systemd" "i686-ssemath-t64-systemd" "ppc64le-systemd" "rv64_lp64d-systemd") + ;; *) echo "Done! No manifests to push for TARGET=${TARGET}." exit 0 diff --git a/python.Dockerfile b/python.Dockerfile index a5d9bf4..2ba9b41 100644 --- a/python.Dockerfile +++ b/python.Dockerfile @@ -11,8 +11,9 @@ RUN <<-EOF # configure portage echo '*/* ~amd64' >> /etc/portage/package.accept_keywords/base.conf - echo '*/* full-stdlib sqlite' >> /etc/portage/package.use/python - echo 'dev-vcs/git -perl' >> /etc/portage/package.use/git + echo 'dev-lang/python **' >> /etc/portage/package.accept_keywords/python.conf + echo '*/* full-stdlib sqlite' >> /etc/portage/package.use/python.conf + echo 'dev-vcs/git -perl' >> /etc/portage/package.use/git.conf # install ::gentoo wget --progress=dot:mega -O - https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz | tar -xz @@ -20,9 +21,9 @@ RUN <<-EOF # main job emerge -1vnt --jobs dev-python/tox app-arch/lzip dev-vcs/git \ - dev-python/pypy{,3_9,3_10}-exe-bin dev-db/sqlite dev-libs/mpdecimal - emerge -1v --jobs --nodeps dev-lang/python:{2.7,3.8,3.9,3.10,3.11,3.12,3.13} \ - dev-python/pypy{,3_9,3_10,3} + dev-python/pypy{,3_10}-exe-bin dev-db/sqlite dev-libs/mpdecimal + emerge -1v --jobs --nodeps dev-lang/python:{2.7,3.8,3.9,3.10,3.11,3.12,{3.13,3.14}{,t}} \ + dev-lang/pypy:{2.7,3.10} # cleanup rm -r /var/db/repos/* /var/cache/distfiles/* |