From a933b1ab26b5202969ae5a4e017cd3133cea7e77 Mon Sep 17 00:00:00 2001 From: Ethan Ho <53266718+ethho@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:09:12 -0500 Subject: [PATCH] Add python 3.12 --- .github/workflows/development.yaml | 24 ++++++++++++++++++++++-- config/.env | 5 ++++- tests/main.sh | 6 +++++- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index 5d45582..2322310 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -8,6 +8,10 @@ jobs: strategy: matrix: include: + - distro: alpine + conda_ver: '22.11.1' + py_ver: '3.12' + platform: linux/amd64 - distro: alpine conda_ver: '22.11.1' py_ver: '3.11' @@ -28,6 +32,10 @@ jobs: conda_ver: '22.11.1' py_ver: '3.7' platform: linux/amd64 + - distro: debian + conda_ver: '22.11.1' + py_ver: '3.12' + platform: linux/amd64 - distro: debian conda_ver: '22.11.1' py_ver: '3.11' @@ -98,6 +106,9 @@ jobs: strategy: matrix: include: + - distro: alpine + py_ver: '3.12' + platform: linux/amd64 - distro: alpine py_ver: '3.11' platform: linux/amd64 @@ -113,6 +124,9 @@ jobs: - distro: alpine py_ver: '3.7' platform: linux/amd64 + - distro: debian + py_ver: '3.12' + platform: linux/amd64 - distro: debian py_ver: '3.11' platform: linux/amd64 @@ -171,6 +185,9 @@ jobs: strategy: matrix: include: + - distro: alpine + py_ver: '3.12' + platform: linux/amd64 - distro: alpine py_ver: '3.11' platform: linux/amd64 @@ -186,6 +203,9 @@ jobs: - distro: alpine py_ver: '3.7' platform: linux/amd64 + - distro: debian + py_ver: '3.12' + platform: linux/amd64 - distro: debian py_ver: '3.11' platform: linux/amd64 @@ -237,7 +257,7 @@ jobs: docker push "${IMAGE}:${TAG}" docker tag "${IMAGE}:${TAG}" "${IMAGE}:${TAG}-${GITHUB_SHA:0:7}" docker push "${IMAGE}:${TAG}-${GITHUB_SHA:0:7}" - [ "$PY_VER" == "3.11" ] && [ "$DISTRO" == "debian" ] \ + [ "$PY_VER" == "3.12" ] && [ "$DISTRO" == "debian" ] \ && docker tag "${IMAGE}:${TAG}" "${IMAGE}:latest" \ && docker push "${IMAGE}:latest" \ || echo "skipping 'latest' tag..." @@ -282,4 +302,4 @@ jobs: with: branch: gh-pages directory: gh-pages - github_token: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file + github_token: ${{secrets.GITHUB_TOKEN}} diff --git a/config/.env b/config/.env index 0bfe8f9..aec20df 100644 --- a/config/.env +++ b/config/.env @@ -1,5 +1,8 @@ ## build +# PY_VER='3.12' +# CONDA_VER=22.11.1 + # PY_VER='3.11' # CONDA_VER=22.11.1 @@ -31,4 +34,4 @@ DISTRO=alpine PACKAGE_MANAGER=apk # DISTRO=debian -# PACKAGE_MANAGER=apt \ No newline at end of file +# PACKAGE_MANAGER=apt diff --git a/tests/main.sh b/tests/main.sh index 1462bcb..f716110 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -45,7 +45,9 @@ IMAGE=$(echo $REF | awk -F':' '{print $1}') SHELL_CMD_TEMPLATE="docker run --rm -i \$SHELL_CMD_FLAGS $REF \ $(docker inspect "$REF" --format '{{join .Config.Cmd " "}}') -c" # determine reference size -if [ $DISTRO == alpine ] && [ $PY_VER == '3.11' ] && [ $PLATFORM == 'linux/amd64' ]; then +if [ $DISTRO == alpine ] && [ $PY_VER == '3.12' ] && [ $PLATFORM == 'linux/amd64' ]; then + SIZE_LIMIT=774 +elif [ $DISTRO == alpine ] && [ $PY_VER == '3.11' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=774 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=543 @@ -55,6 +57,8 @@ elif [ $DISTRO == alpine ] && [ $PY_VER == '3.8' ] && [ $PLATFORM == 'linux/amd6 SIZE_LIMIT=516 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.7' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=481 +elif [ $DISTRO == debian ] && [ $PY_VER == '3.12' ] && [ $PLATFORM == 'linux/amd64' ]; then + SIZE_LIMIT=897 elif [ $DISTRO == debian ] && [ $PY_VER == '3.11' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=897 elif [ $DISTRO == debian ] && [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then