-
Notifications
You must be signed in to change notification settings - Fork 2.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update bash #16643
Merged
Merged
Update bash #16643
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
This comment has been minimized.
This comment has been minimized.
Changes: - tianon/docker-bash@7b657f0: Update devel to 20240422, commit 8c8daff1e3661cfe427f194c38c6a1b452cd1456 - tianon/docker-bash@147bc22: Merge pull request tianon/docker-bash#37 from self-five/5.3-alpha - tianon/docker-bash@608eced: Add 5.3-alpha
c585e24
to
3aa5f9e
Compare
Diff for 3aa5f9e:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 0e355fc..396fc86 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -56,7 +56,12 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 3eae20ac57eaeb63ef9e438b67bfc135a948995a
Directory: 5.2
-Tags: devel-20240415, devel, devel-20240415-alpine3.19, devel-alpine3.19
+Tags: 5.3-alpha, 5.3-rc, rc, 5.3-alpha-alpine3.19, 5.3-rc-alpine3.19, rc-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 3519de9825d4c678a4996b4ce172773387f3dbc2
+GitCommit: 608eced9a1929c57fec449ea5f2f770a0371e5a3
+Directory: 5.3-rc
+
+Tags: devel-20240422, devel, devel-20240422-alpine3.19, devel-alpine3.19
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 7b657f0af13de947770f02d66ab0b24465b20f3c
Directory: devel
diff --git a/_bashbrew-list b/_bashbrew-list
index e60a082..5994ef0 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -48,9 +48,15 @@ bash:5.2
bash:5.2-alpine3.19
bash:5.2.26
bash:5.2.26-alpine3.19
+bash:5.3-alpha
+bash:5.3-alpha-alpine3.19
+bash:5.3-rc
+bash:5.3-rc-alpine3.19
bash:alpine3.19
bash:devel
-bash:devel-20240415
-bash:devel-20240415-alpine3.19
+bash:devel-20240422
+bash:devel-20240422-alpine3.19
bash:devel-alpine3.19
bash:latest
+bash:rc
+bash:rc-alpine3.19
diff --git a/bash_devel-alpine3.19/Dockerfile b/bash_devel-alpine3.19/Dockerfile
index d0d575c..464e1c1 100644
--- a/bash_devel-alpine3.19/Dockerfile
+++ b/bash_devel-alpine3.19/Dockerfile
@@ -7,9 +7,9 @@
FROM alpine:3.19
# https://git.savannah.gnu.org/cgit/bash.git/log/?h=devel
-ENV _BASH_COMMIT a06616a689a239e0ade2c08ae78fd114d2324c5a
-# fix recogniation of IN token in for command nested within case command
-ENV _BASH_VERSION devel-20240415
+ENV _BASH_COMMIT 8c8daff1e3661cfe427f194c38c6a1b452cd1456
+# minor updates to several tests
+ENV _BASH_VERSION devel-20240422
# prefixed with "_" since "$BASH..." have meaning in Bash parlance
RUN set -eux; \
diff --git a/bash_5.0-alpine3.19/Dockerfile b/bash_rc-alpine3.19/Dockerfile
similarity index 94%
copy from bash_5.0-alpine3.19/Dockerfile
copy to bash_rc-alpine3.19/Dockerfile
index d7f2d20..1f81179 100644
--- a/bash_5.0-alpine3.19/Dockerfile
+++ b/bash_rc-alpine3.19/Dockerfile
@@ -7,10 +7,8 @@
FROM alpine:3.19
# https://ftp.gnu.org/gnu/bash/?C=M;O=D
-ENV _BASH_VERSION 5.0.18
-ENV _BASH_BASELINE 5.0
-# https://ftp.gnu.org/gnu/bash/bash-5.0-patches/?C=M;O=D
-ENV _BASH_LATEST_PATCH 18
+ENV _BASH_VERSION 5.3-alpha
+ENV _BASH_BASELINE 5.3-alpha
# prefixed with "_" since "$BASH..." have meaning in Bash parlance
RUN set -eux; \
@@ -120,7 +118,7 @@ RUN set -eux; \
\
[ "$(which bash)" = '/usr/local/bin/bash' ]; \
bash --version; \
- [ "$(bash -c 'echo "${BASH_VERSION%%[^0-9.]*}"')" = "$_BASH_VERSION" ]; \
+ [ "$(bash -c 'echo "${BASH_VERSION%%[^0-9.]*}"')" = "${_BASH_VERSION%%-*}.0" ]; \
bash -c 'help' > /dev/null
COPY docker-entrypoint.sh /usr/local/bin/
diff --git a/bash_3-alpine3.19/docker-entrypoint.sh b/bash_rc-alpine3.19/docker-entrypoint.sh
similarity index 100%
copy from bash_3-alpine3.19/docker-entrypoint.sh
copy to bash_rc-alpine3.19/docker-entrypoint.sh Relevant Maintainers:
|
@tianon is alpha and rc the same in this context? |
LaurentGoderre
approved these changes
Apr 23, 2024
Yeah, we have a long-standing convention in DOI that "rc" means "pre-release" (it's not perfect, but it gets the point across reasonably well). |
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: