Update pypy #18291
Merged
Update pypy #18291
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/pypy@fea3f39: Merge pull request docker-library/pypy#85 from infosiftr/ltsc2025 - docker-library/pypy@ac7cebf: Add Windows Server 2025 variant - docker-library/pypy@9badfb7: Simplify and update `verify-templating.yml` - docker-library/pypy@08c83b2: Update README - docker-library/pypy@b176079: Merge pull request docker-library/pypy#84 from docker-library/jq-IN - docker-library/pypy@068b62c: Use jq's `IN()` instead of `index()` - docker-library/pypy@e7036a2: Update `generate-stackbrew-library.sh` to support `BASHBREW_LIBRARY` for easier cascading updates
Diff for e3267bb:diff --git a/_bashbrew-cat b/_bashbrew-cat
index e19a684..bb4017c 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -36,6 +36,13 @@ GitCommit: b28e10b0636684622326bf8e7b731eb96e3615d2
Directory: 2.7/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
+Tags: 2.7-7.3.17-windowsservercore-ltsc2025, 2.7-7.3-windowsservercore-ltsc2025, 2.7-7-windowsservercore-ltsc2025, 2.7-windowsservercore-ltsc2025, 2-7.3.17-windowsservercore-ltsc2025, 2-7.3-windowsservercore-ltsc2025, 2-7-windowsservercore-ltsc2025, 2-windowsservercore-ltsc2025
+SharedTags: 2.7-7.3.17, 2.7-7.3, 2.7-7, 2.7, 2-7.3.17, 2-7.3, 2-7, 2, 2.7-7.3.17-windowsservercore, 2.7-7.3-windowsservercore, 2.7-7-windowsservercore, 2.7-windowsservercore, 2-7.3.17-windowsservercore, 2-7.3-windowsservercore, 2-7-windowsservercore, 2-windowsservercore
+Architectures: windows-amd64
+GitCommit: ac7cebfe74c5bbee2f1212edda14aa4162184cd9
+Directory: 2.7/windows/windowsservercore-ltsc2025
+Constraints: windowsservercore-ltsc2025
+
Tags: 3.10-7.3.17-bookworm, 3.10-7.3-bookworm, 3.10-7-bookworm, 3.10-bookworm, 3-7.3.17-bookworm, 3-7.3-bookworm, 3-7-bookworm, 3-bookworm, bookworm
Architectures: amd64, arm64v8, i386
GitCommit: 122ac4d9f832a77e6ee2261984ba5c6a7c5cbe75
@@ -70,3 +77,10 @@ Architectures: windows-amd64
GitCommit: 122ac4d9f832a77e6ee2261984ba5c6a7c5cbe75
Directory: 3.10/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
+
+Tags: 3.10-7.3.17-windowsservercore-ltsc2025, 3.10-7.3-windowsservercore-ltsc2025, 3.10-7-windowsservercore-ltsc2025, 3.10-windowsservercore-ltsc2025, 3-7.3.17-windowsservercore-ltsc2025, 3-7.3-windowsservercore-ltsc2025, 3-7-windowsservercore-ltsc2025, 3-windowsservercore-ltsc2025, windowsservercore-ltsc2025
+SharedTags: 3.10-7.3.17, 3.10-7.3, 3.10-7, 3.10, 3-7.3.17, 3-7.3, 3-7, 3, latest, 3.10-7.3.17-windowsservercore, 3.10-7.3-windowsservercore, 3.10-7-windowsservercore, 3.10-windowsservercore, 3-7.3.17-windowsservercore, 3-7.3-windowsservercore, 3-7-windowsservercore, 3-windowsservercore, windowsservercore
+Architectures: windows-amd64
+GitCommit: ac7cebfe74c5bbee2f1212edda14aa4162184cd9
+Directory: 3.10/windows/windowsservercore-ltsc2025
+Constraints: windowsservercore-ltsc2025
diff --git a/_bashbrew-list b/_bashbrew-list
index aaee2a4..9b21278 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -8,6 +8,7 @@ pypy:2-7-slim-bullseye
pypy:2-7-windowsservercore
pypy:2-7-windowsservercore-1809
pypy:2-7-windowsservercore-ltsc2022
+pypy:2-7-windowsservercore-ltsc2025
pypy:2-7.3
pypy:2-7.3-bookworm
pypy:2-7.3-bullseye
@@ -17,6 +18,7 @@ pypy:2-7.3-slim-bullseye
pypy:2-7.3-windowsservercore
pypy:2-7.3-windowsservercore-1809
pypy:2-7.3-windowsservercore-ltsc2022
+pypy:2-7.3-windowsservercore-ltsc2025
pypy:2-7.3.17
pypy:2-7.3.17-bookworm
pypy:2-7.3.17-bullseye
@@ -26,6 +28,7 @@ pypy:2-7.3.17-slim-bullseye
pypy:2-7.3.17-windowsservercore
pypy:2-7.3.17-windowsservercore-1809
pypy:2-7.3.17-windowsservercore-ltsc2022
+pypy:2-7.3.17-windowsservercore-ltsc2025
pypy:2-bookworm
pypy:2-bullseye
pypy:2-slim
@@ -34,6 +37,7 @@ pypy:2-slim-bullseye
pypy:2-windowsservercore
pypy:2-windowsservercore-1809
pypy:2-windowsservercore-ltsc2022
+pypy:2-windowsservercore-ltsc2025
pypy:2.7
pypy:2.7-7
pypy:2.7-7-bookworm
@@ -44,6 +48,7 @@ pypy:2.7-7-slim-bullseye
pypy:2.7-7-windowsservercore
pypy:2.7-7-windowsservercore-1809
pypy:2.7-7-windowsservercore-ltsc2022
+pypy:2.7-7-windowsservercore-ltsc2025
pypy:2.7-7.3
pypy:2.7-7.3-bookworm
pypy:2.7-7.3-bullseye
@@ -53,6 +58,7 @@ pypy:2.7-7.3-slim-bullseye
pypy:2.7-7.3-windowsservercore
pypy:2.7-7.3-windowsservercore-1809
pypy:2.7-7.3-windowsservercore-ltsc2022
+pypy:2.7-7.3-windowsservercore-ltsc2025
pypy:2.7-7.3.17
pypy:2.7-7.3.17-bookworm
pypy:2.7-7.3.17-bullseye
@@ -62,6 +68,7 @@ pypy:2.7-7.3.17-slim-bullseye
pypy:2.7-7.3.17-windowsservercore
pypy:2.7-7.3.17-windowsservercore-1809
pypy:2.7-7.3.17-windowsservercore-ltsc2022
+pypy:2.7-7.3.17-windowsservercore-ltsc2025
pypy:2.7-bookworm
pypy:2.7-bullseye
pypy:2.7-slim
@@ -70,6 +77,7 @@ pypy:2.7-slim-bullseye
pypy:2.7-windowsservercore
pypy:2.7-windowsservercore-1809
pypy:2.7-windowsservercore-ltsc2022
+pypy:2.7-windowsservercore-ltsc2025
pypy:3
pypy:3-7
pypy:3-7-bookworm
@@ -80,6 +88,7 @@ pypy:3-7-slim-bullseye
pypy:3-7-windowsservercore
pypy:3-7-windowsservercore-1809
pypy:3-7-windowsservercore-ltsc2022
+pypy:3-7-windowsservercore-ltsc2025
pypy:3-7.3
pypy:3-7.3-bookworm
pypy:3-7.3-bullseye
@@ -89,6 +98,7 @@ pypy:3-7.3-slim-bullseye
pypy:3-7.3-windowsservercore
pypy:3-7.3-windowsservercore-1809
pypy:3-7.3-windowsservercore-ltsc2022
+pypy:3-7.3-windowsservercore-ltsc2025
pypy:3-7.3.17
pypy:3-7.3.17-bookworm
pypy:3-7.3.17-bullseye
@@ -98,6 +108,7 @@ pypy:3-7.3.17-slim-bullseye
pypy:3-7.3.17-windowsservercore
pypy:3-7.3.17-windowsservercore-1809
pypy:3-7.3.17-windowsservercore-ltsc2022
+pypy:3-7.3.17-windowsservercore-ltsc2025
pypy:3-bookworm
pypy:3-bullseye
pypy:3-slim
@@ -106,6 +117,7 @@ pypy:3-slim-bullseye
pypy:3-windowsservercore
pypy:3-windowsservercore-1809
pypy:3-windowsservercore-ltsc2022
+pypy:3-windowsservercore-ltsc2025
pypy:3.10
pypy:3.10-7
pypy:3.10-7-bookworm
@@ -116,6 +128,7 @@ pypy:3.10-7-slim-bullseye
pypy:3.10-7-windowsservercore
pypy:3.10-7-windowsservercore-1809
pypy:3.10-7-windowsservercore-ltsc2022
+pypy:3.10-7-windowsservercore-ltsc2025
pypy:3.10-7.3
pypy:3.10-7.3-bookworm
pypy:3.10-7.3-bullseye
@@ -125,6 +138,7 @@ pypy:3.10-7.3-slim-bullseye
pypy:3.10-7.3-windowsservercore
pypy:3.10-7.3-windowsservercore-1809
pypy:3.10-7.3-windowsservercore-ltsc2022
+pypy:3.10-7.3-windowsservercore-ltsc2025
pypy:3.10-7.3.17
pypy:3.10-7.3.17-bookworm
pypy:3.10-7.3.17-bullseye
@@ -134,6 +148,7 @@ pypy:3.10-7.3.17-slim-bullseye
pypy:3.10-7.3.17-windowsservercore
pypy:3.10-7.3.17-windowsservercore-1809
pypy:3.10-7.3.17-windowsservercore-ltsc2022
+pypy:3.10-7.3.17-windowsservercore-ltsc2025
pypy:3.10-bookworm
pypy:3.10-bullseye
pypy:3.10-slim
@@ -142,6 +157,7 @@ pypy:3.10-slim-bullseye
pypy:3.10-windowsservercore
pypy:3.10-windowsservercore-1809
pypy:3.10-windowsservercore-ltsc2022
+pypy:3.10-windowsservercore-ltsc2025
pypy:bookworm
pypy:bullseye
pypy:latest
@@ -151,3 +167,4 @@ pypy:slim-bullseye
pypy:windowsservercore
pypy:windowsservercore-1809
pypy:windowsservercore-ltsc2022
+pypy:windowsservercore-ltsc2025
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 6c687b3..e8dc104 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -4,9 +4,11 @@ pypy:2-slim-bookworm
pypy:2-slim-bullseye
pypy:2-windowsservercore-1809
pypy:2-windowsservercore-ltsc2022
+pypy:2-windowsservercore-ltsc2025
pypy:bookworm
pypy:bullseye
pypy:slim-bookworm
pypy:slim-bullseye
pypy:windowsservercore-1809
pypy:windowsservercore-ltsc2022
+pypy:windowsservercore-ltsc2025
diff --git a/pypy_2-windowsservercore-1809/Dockerfile b/pypy_2-windowsservercore-ltsc2025/Dockerfile
similarity index 98%
copy from pypy_2-windowsservercore-1809/Dockerfile
copy to pypy_2-windowsservercore-ltsc2025/Dockerfile
index f2097c0..7641ed9 100644
--- a/pypy_2-windowsservercore-1809/Dockerfile
+++ b/pypy_2-windowsservercore-ltsc2025/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
diff --git a/pypy_windowsservercore-1809/Dockerfile b/pypy_windowsservercore-ltsc2025/Dockerfile
similarity index 98%
copy from pypy_windowsservercore-1809/Dockerfile
copy to pypy_windowsservercore-ltsc2025/Dockerfile
index daaee21..d448eb4 100644
--- a/pypy_windowsservercore-1809/Dockerfile
+++ b/pypy_windowsservercore-ltsc2025/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]Relevant Maintainers: |
yosifkit
approved these changes
Jan 22, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes:
verify-templating.ymlIN()instead ofindex()pypy#84 from docker-library/jq-ININ()instead ofindex()generate-stackbrew-library.shto supportBASHBREW_LIBRARYfor easier cascading updates