From 1fb113d9f8a9e0714c51cfb6fed4f6559f4d298e Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Wed, 9 Oct 2024 12:41:13 -0400 Subject: [PATCH] ignore test failures like pre 3.13 --- Dockerfile | 6 +++++- Dockerfile.aarch64 | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f5847bc..ba3e568 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as buildstage # set version label -ARG PYTHON_VERSION=3.12.4 +ARG PYTHON_VERSION ENV MAKEFLAGS="-j4" @@ -40,6 +40,9 @@ RUN \ xz-dev \ zlib-dev && \ echo "**** compile python ****" && \ + if [ -z "${PYTHON_VERSION}" ]; then \ + PYTHON_VERSION=$(curl -sX GET https://api.github.com/repos/python/cpython/tags | jq -r '.[] | select(.name | contains("rc") or contains("a") or contains("b") | not) | .name' | sed 's|^v||g' | sort -rV | head -1); \ + fi && \ mkdir -p \ /tmp/python \ /pythoncompiled && \ @@ -53,6 +56,7 @@ RUN \ patch -d /tmp/python -p 1 < "${patch}"; \ done && \ cd /tmp/python && \ + sed -i -E 's|\$\(LLVM_PROF_FILE\) \$\(RUNSHARED\) \./\$\(BUILDPYTHON\) \$\(PROFILE_TASK\)$|$(LLVM_PROF_FILE) $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK) \|\| true|g' Makefile.pre.in && \ ./configure \ --build="x86_64-linux-musl" \ --enable-loadable-sqlite-extensions \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f341f66..3629f9e 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -3,7 +3,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 as buildstage # set version label -ARG PYTHON_VERSION=3.12.4 +ARG PYTHON_VERSION ENV MAKEFLAGS="-j4" @@ -40,6 +40,9 @@ RUN \ xz-dev \ zlib-dev && \ echo "**** compile python ****" && \ + if [ -z "${PYTHON_VERSION}" ]; then \ + PYTHON_VERSION=$(curl -sX GET https://api.github.com/repos/python/cpython/tags | jq -r '.[] | select(.name | contains("rc") or contains("a") or contains("b") | not) | .name' | sed 's|^v||g' | sort -rV | head -1); \ + fi && \ mkdir -p \ /tmp/python \ /pythoncompiled && \ @@ -53,6 +56,7 @@ RUN \ patch -d /tmp/python -p 1 < "${patch}"; \ done && \ cd /tmp/python && \ + sed -i -E 's|\$\(LLVM_PROF_FILE\) \$\(RUNSHARED\) \./\$\(BUILDPYTHON\) \$\(PROFILE_TASK\)$|$(LLVM_PROF_FILE) $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK) \|\| true|g' Makefile.pre.in && \ ./configure \ --build="x86_64-linux-musl" \ --enable-loadable-sqlite-extensions \