-
Notifications
You must be signed in to change notification settings - Fork 333
Revert "Update patch file shasum" #360
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
Conversation
|
Or apparently not? But it is the old sha from my machine: $ docker run -it --rm buildpack-deps
root@2e1b1b25cc97:/# wget -O autoconf-2.70.patch https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch
--2021-08-23 16:53:11-- https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch
Resolving github.com (github.com)... 192.30.255.113
Connecting to github.com (github.com)|192.30.255.113|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: 1908 (1.9K) [text/plain]
Saving to: 'autoconf-2.70.patch'
autoconf-2.70.patch 100%[======================>] 1.86K --.-KB/s in 0s
2021-08-23 16:53:11 (9.98 MB/s) - 'autoconf-2.70.patch' saved [1908/1908]
root@2e1b1b25cc97:/# sha256sum autoconf-2.70.patch
62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54 autoconf-2.70.patch |
|
And new it is the new sha from my machine from the same upstream IP 😢 $ docker run -it --rm buildpack-deps
root@963a59292716:/# wget -O autoconf-2.70.patch https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch
--2021-08-23 16:58:46-- https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch
Resolving github.com (github.com)... 192.30.255.113
Connecting to github.com (github.com)|192.30.255.113|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: 1910 (1.9K) [text/plain]
Saving to: 'autoconf-2.70.patch'
autoconf-2.70.patch 100%[======================>] 1.87K --.-KB/s in 0s
2021-08-23 16:58:46 (9.49 MB/s) - 'autoconf-2.70.patch' saved [1910/1910]
root@963a59292716:/# sha256sum autoconf-2.70.patch
95565a8a8f0eddd39d76fe8af63fc34b6429c956c8f8fe0aa17282d37adced64 autoconf-2.70.patchI didn't save the old one, but this one is slightly longer |
|
Finally got both the old and new. Thanks, GitHub... 👎 --- autoconf-2.70.patch 2021-08-23 10:03:59.000000000 -0700
+++ autoconf-2.70.patch.new 2021-08-23 09:56:26.125489195 -0700
@@ -35,7 +35,7 @@
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
-index a5e3dc76f6f5..4e4a52f066d6 100644
+index a5e3dc76f6f55..4e4a52f066d64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -271,13 +271,14 @@ AS_CASE(["$host_os:$build_os"], |
|
I guess we should maybe stop taking a checksum of the file and trust that GitHub + full commit hash should be reasonably stable? 😞 (or embed both checksums?? that seems a bit extra) |
We pull it via https, and thus can generally trust that we get the right thing -- we've had *many* instances of the sha256sum flopping back and forth based on minor adjustments to the generated patch format GitHub generates.
3dc35e2 to
659f4ab
Compare
|
Updated with a new commit:
|
Changes: - docker-library/ruby@2caaf19: Merge pull request docker-library/ruby#360 from docker-library/revert-358-confused - docker-library/ruby@659f4ab: Remove sha256sum from GitHub patch file
Changes: - docker-library/ruby@4d6eafa: Merge pull request docker-library/ruby#364 from infosiftr/arches - docker-library/ruby@53a12c2: Use libucontext in 2.7 to fix alpine based builds on arm32v6/7 and s390x - docker-library/ruby@2caaf19: Merge pull request docker-library/ruby#360 from docker-library/revert-358-confused - docker-library/ruby@659f4ab: Remove sha256sum from GitHub patch file
Apparently, GitHub has fixed whatever caused the sha256sum change.
Reverts #358