Add back Windows variants 🚀

hylang · Aug 29, 2024 · 72b605d · 72b605d
1 parent 5e78df9
commit 72b605d
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 8 deletions.
diff --git a/dockerfiles-generated/Dockerfile.pypy3.10-windowsservercore-1809 b/dockerfiles-generated/Dockerfile.pypy3.10-windowsservercore-1809
@@ -0,0 +1,8 @@
+FROM pypy:3.10-windowsservercore-1809
+
+ENV HY_VERSION 0.29.0
+ENV HYRULE_VERSION 0.6.0
+
+RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION) ('hyrule == {0}' -f $env:HYRULE_VERSION)
+
+CMD ["hy"]
diff --git a/dockerfiles-generated/Dockerfile.pypy3.10-windowsservercore-ltsc2022 b/dockerfiles-generated/Dockerfile.pypy3.10-windowsservercore-ltsc2022
@@ -0,0 +1,8 @@
+FROM pypy:3.10-windowsservercore-ltsc2022
+
+ENV HY_VERSION 0.29.0
+ENV HYRULE_VERSION 0.6.0
+
+RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION) ('hyrule == {0}' -f $env:HYRULE_VERSION)
+
+CMD ["hy"]
diff --git a/dockerfiles-generated/Dockerfile.python3.11-windowsservercore-1809 b/dockerfiles-generated/Dockerfile.python3.11-windowsservercore-1809
@@ -0,0 +1,8 @@
+FROM python:3.11-windowsservercore-1809
+
+ENV HY_VERSION 0.29.0
+ENV HYRULE_VERSION 0.6.0
+
+RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION) ('hyrule == {0}' -f $env:HYRULE_VERSION)
+
+CMD ["hy"]
diff --git a/dockerfiles-generated/Dockerfile.python3.11-windowsservercore-ltsc2022 b/dockerfiles-generated/Dockerfile.python3.11-windowsservercore-ltsc2022
@@ -0,0 +1,8 @@
+FROM python:3.11-windowsservercore-ltsc2022
+
+ENV HY_VERSION 0.29.0
+ENV HYRULE_VERSION 0.6.0
+
+RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION) ('hyrule == {0}' -f $env:HYRULE_VERSION)
+
+CMD ["hy"]
diff --git a/dockerfiles-generated/Dockerfile.python3.12-windowsservercore-1809 b/dockerfiles-generated/Dockerfile.python3.12-windowsservercore-1809
@@ -0,0 +1,8 @@
+FROM python:3.12-windowsservercore-1809
+
+ENV HY_VERSION 0.29.0
+ENV HYRULE_VERSION 0.6.0
+
+RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION) ('hyrule == {0}' -f $env:HYRULE_VERSION)
+
+CMD ["hy"]
diff --git a/dockerfiles-generated/Dockerfile.python3.12-windowsservercore-ltsc2022 b/dockerfiles-generated/Dockerfile.python3.12-windowsservercore-ltsc2022
@@ -0,0 +1,8 @@
+FROM python:3.12-windowsservercore-ltsc2022
+
+ENV HY_VERSION 0.29.0
+ENV HYRULE_VERSION 0.6.0
+
+RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION) ('hyrule == {0}' -f $env:HYRULE_VERSION)
+
+CMD ["hy"]
diff --git a/dockerfiles-generated/library-hylang.template b/dockerfiles-generated/library-hylang.template
@@ -20,6 +20,18 @@ Tags: 0.29.0-python3.12-alpine3.19, 0.29-python3.12-alpine3.19, 0-python3.12-alp
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 File: Dockerfile.python3.12-alpine3.19
 
+Tags: 0.29.0-python3.12-windowsservercore-ltsc2022, 0.29-python3.12-windowsservercore-ltsc2022, 0-python3.12-windowsservercore-ltsc2022, python3.12-windowsservercore-ltsc2022, 0.29.0-windowsservercore-ltsc2022, 0.29-windowsservercore-ltsc2022, 0-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 0.29.0-python3.12, 0.29-python3.12, 0-python3.12, python3.12, 0.29.0, 0.29, 0, latest
+Architectures: windows-amd64
+Constraints: windowsservercore-ltsc2022
+File: Dockerfile.python3.12-windowsservercore-ltsc2022
+
+Tags: 0.29.0-python3.12-windowsservercore-1809, 0.29-python3.12-windowsservercore-1809, 0-python3.12-windowsservercore-1809, python3.12-windowsservercore-1809, 0.29.0-windowsservercore-1809, 0.29-windowsservercore-1809, 0-windowsservercore-1809, windowsservercore-1809
+SharedTags: 0.29.0-python3.12, 0.29-python3.12, 0-python3.12, python3.12, 0.29.0, 0.29, 0, latest
+Architectures: windows-amd64
+Constraints: windowsservercore-1809
+File: Dockerfile.python3.12-windowsservercore-1809
+
 Tags: 0.29.0-python3.11-bookworm, 0.29-python3.11-bookworm, 0-python3.11-bookworm, python3.11-bookworm
 SharedTags: 0.29.0-python3.11, 0.29-python3.11, 0-python3.11, python3.11
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -37,6 +49,18 @@ Tags: 0.29.0-python3.11-alpine3.19, 0.29-python3.11-alpine3.19, 0-python3.11-alp
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 File: Dockerfile.python3.11-alpine3.19
 
+Tags: 0.29.0-python3.11-windowsservercore-ltsc2022, 0.29-python3.11-windowsservercore-ltsc2022, 0-python3.11-windowsservercore-ltsc2022, python3.11-windowsservercore-ltsc2022
+SharedTags: 0.29.0-python3.11, 0.29-python3.11, 0-python3.11, python3.11
+Architectures: windows-amd64
+Constraints: windowsservercore-ltsc2022
+File: Dockerfile.python3.11-windowsservercore-ltsc2022
+
+Tags: 0.29.0-python3.11-windowsservercore-1809, 0.29-python3.11-windowsservercore-1809, 0-python3.11-windowsservercore-1809, python3.11-windowsservercore-1809
+SharedTags: 0.29.0-python3.11, 0.29-python3.11, 0-python3.11, python3.11
+Architectures: windows-amd64
+Constraints: windowsservercore-1809
+File: Dockerfile.python3.11-windowsservercore-1809
+
 Tags: 0.29.0-python3.10-bookworm, 0.29-python3.10-bookworm, 0-python3.10-bookworm, python3.10-bookworm
 SharedTags: 0.29.0-python3.10, 0.29-python3.10, 0-python3.10, python3.10
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -96,3 +120,15 @@ File: Dockerfile.pypy3.10-bookworm
 Tags: 0.29.0-pypy3.10-bullseye, 0.29-pypy3.10-bullseye, 0-pypy3.10-bullseye, pypy3.10-bullseye, 0.29.0-pypy-bullseye, 0.29-pypy-bullseye, 0-pypy-bullseye, pypy-bullseye
 Architectures: amd64, arm64v8, i386
 File: Dockerfile.pypy3.10-bullseye
+
+Tags: 0.29.0-pypy3.10-windowsservercore-ltsc2022, 0.29-pypy3.10-windowsservercore-ltsc2022, 0-pypy3.10-windowsservercore-ltsc2022, pypy3.10-windowsservercore-ltsc2022, 0.29.0-pypy-windowsservercore-ltsc2022, 0.29-pypy-windowsservercore-ltsc2022, 0-pypy-windowsservercore-ltsc2022, pypy-windowsservercore-ltsc2022
+SharedTags: 0.29.0-pypy3.10, 0.29-pypy3.10, 0-pypy3.10, pypy3.10, 0.29.0-pypy, 0.29-pypy, 0-pypy, pypy
+Architectures: windows-amd64
+Constraints: windowsservercore-ltsc2022
+File: Dockerfile.pypy3.10-windowsservercore-ltsc2022
+
+Tags: 0.29.0-pypy3.10-windowsservercore-1809, 0.29-pypy3.10-windowsservercore-1809, 0-pypy3.10-windowsservercore-1809, pypy3.10-windowsservercore-1809, 0.29.0-pypy-windowsservercore-1809, 0.29-pypy-windowsservercore-1809, 0-pypy-windowsservercore-1809, pypy-windowsservercore-1809
+SharedTags: 0.29.0-pypy3.10, 0.29-pypy3.10, 0-pypy3.10, pypy3.10, 0.29.0-pypy, 0.29-pypy, 0-pypy, pypy
+Architectures: windows-amd64
+Constraints: windowsservercore-1809
+File: Dockerfile.pypy3.10-windowsservercore-1809
diff --git a/update.sh b/update.sh
@@ -151,14 +151,8 @@ for base in "${bases[@]}"; do
 			target="Dockerfile.$hyTag" # "dockerfiles-generated/Dockerfile.python3.7-stretch", etc.
 
 			case "$variant" in
-				windowsservercore-*)
-					case "${python%-rc}" in
-						3.6 | 3.7 | 3.8 | 3.9) ;;
-						*) continue ;; # https://github.com/hylang/hy/issues/2114: Python 3.10 + Windows == incompatible thanks to pyreadline
-					esac
-					template='Dockerfile-windows.template'
-					;;
-				*) template='Dockerfile-linux.template' ;;
+				windowsservercore-*) template='Dockerfile-windows.template' ;;
+				*)                   template='Dockerfile-linux.template'   ;;
 			esac
 
 			echo "- $from ($target)"