Skip to content

Commit

Permalink
Bump erlang
Browse files Browse the repository at this point in the history
And revert erlang patch backports
yosifkit committed Jan 28, 2025
1 parent dd27cf7 commit a6e24f2
Showing 8 changed files with 18 additions and 38 deletions.
9 changes: 2 additions & 7 deletions 3.13/alpine/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 3.13/ubuntu/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 2 additions & 7 deletions 4.0/alpine/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 4.0/ubuntu/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 2 additions & 7 deletions 4.1-rc/alpine/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 4.1-rc/ubuntu/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions Dockerfile-alpine.template
Original file line number Diff line number Diff line change
@@ -134,11 +134,6 @@ RUN set -eux; \
echo "$OTP_SOURCE_SHA256 *$OTP_PATH.tar.gz" | sha256sum -c -; \
tar --extract --file "$OTP_PATH.tar.gz" --directory "$OTP_PATH" --strip-components 1; \
\
# https://github.com/erlang/otp/pull/9212
wget --output-document otp-9212.patch 'https://github.com/erlang/otp/commit/e2604aa7a92b3bb7c1293afd12705c7ce9c952a4.patch?full_index=1'; \
echo '35ec51529bdd6cab4b173b4e1fe844efa82f74eba76a99a74f746778d64dffa7 *otp-9212.patch' | sha256sum -c -; \
patch --input="$PWD/otp-9212.patch" --directory="$OTP_PATH" --strip=1; \
\
# Configure Erlang/OTP for compilation, disable unused features & applications
# https://erlang.org/doc/applications.html
# ERL_TOP is required for Erlang/OTP makefiles to find the absolute path for the installation
12 changes: 6 additions & 6 deletions versions.json
Original file line number Diff line number Diff line change
@@ -8,8 +8,8 @@
"version": "3.1.7"
},
"otp": {
"sha256": "96ce3340450756fdabf8fdb2e3ceb0489eb679f6b51b7b7ac6417c2e6f495bb8",
"version": "26.2.5.6"
"sha256": "49afee0ae2c5f9537c4c433caf1ae6d04d8b2cf74aa92c50f133d9feebdf1036",
"version": "26.2.5.7"
},
"ubuntu": {
"version": "24.04"
@@ -26,8 +26,8 @@
"version": "3.3.2"
},
"otp": {
"sha256": "b66c2cc4fa2c87211b668e4486d4f3e5b1b6705698873ea3e6d9850801ac992d",
"version": "27.2"
"sha256": "07982134e10637dde57cf9cdc6dda6f65425810229986136d184766d4db9eda3",
"version": "27.2.1"
},
"ubuntu": {
"version": "24.04"
@@ -44,8 +44,8 @@
"version": "3.3.2"
},
"otp": {
"sha256": "b66c2cc4fa2c87211b668e4486d4f3e5b1b6705698873ea3e6d9850801ac992d",
"version": "27.2"
"sha256": "07982134e10637dde57cf9cdc6dda6f65425810229986136d184766d4db9eda3",
"version": "27.2.1"
},
"ubuntu": {
"version": "24.04"

0 comments on commit a6e24f2

Please sign in to comment.