Skip to content
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.

Sign up for GitHub

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

Jump to bottom

haxe: fix builds regarding extlib #17649

Merged
merged 1 commit into from
Oct 1, 2024
Merged

haxe: fix builds regarding extlib #17649

merged 1 commit into from
Oct 1, 2024

Conversation

andyli
Copy link
Contributor

@andyli andyli commented Oct 1, 2024

@andyli andyli requested a review from a team as a code owner October 1, 2024 06:52
@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 1, 2024

Diff for bef07bf: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 948b139..642d00a 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,28 +3,28 @@ GitRepo: https://github.com/HaxeFoundation/docker-library-haxe.git
 
 Tags: 4.0.5-alpine3.17, 4.0-alpine3.17
 Architectures: amd64, arm64v8
-GitCommit: 28b986eccdcf136c1a6f705cab132abf63e88a56
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.0/alpine3.17
 
 Tags: 4.0.5-alpine3.18, 4.0-alpine3.18
 Architectures: amd64, arm64v8
-GitCommit: 28b986eccdcf136c1a6f705cab132abf63e88a56
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.0/alpine3.18
 
 Tags: 4.0.5-alpine3.19, 4.0-alpine3.19
 Architectures: amd64, arm64v8
-GitCommit: 28b986eccdcf136c1a6f705cab132abf63e88a56
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.0/alpine3.19
 
 Tags: 4.0.5-alpine3.20, 4.0-alpine3.20, 4.0.5-alpine, 4.0-alpine
 Architectures: amd64, arm64v8
-GitCommit: 28b986eccdcf136c1a6f705cab132abf63e88a56
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.0/alpine3.20
 
 Tags: 4.0.5-bullseye, 4.0-bullseye
 SharedTags: 4.0.5, 4.0
 Architectures: amd64, arm32v7, arm64v8
-GitCommit: 28b986eccdcf136c1a6f705cab132abf63e88a56
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.0/bullseye
 
 Tags: 4.0.5-windowsservercore-1809, 4.0-windowsservercore-1809
@@ -43,28 +43,28 @@ Constraints: windowsservercore-ltsc2022
 
 Tags: 4.1.5-alpine3.17, 4.1-alpine3.17
 Architectures: amd64, arm64v8
-GitCommit: 28b986eccdcf136c1a6f705cab132abf63e88a56
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.1/alpine3.17
 
 Tags: 4.1.5-alpine3.18, 4.1-alpine3.18
 Architectures: amd64, arm64v8
-GitCommit: 28b986eccdcf136c1a6f705cab132abf63e88a56
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.1/alpine3.18
 
 Tags: 4.1.5-alpine3.19, 4.1-alpine3.19
 Architectures: amd64, arm64v8
-GitCommit: 28b986eccdcf136c1a6f705cab132abf63e88a56
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.1/alpine3.19
 
 Tags: 4.1.5-alpine3.20, 4.1-alpine3.20, 4.1.5-alpine, 4.1-alpine
 Architectures: amd64, arm64v8
-GitCommit: 28b986eccdcf136c1a6f705cab132abf63e88a56
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.1/alpine3.20
 
 Tags: 4.1.5-bullseye, 4.1-bullseye
 SharedTags: 4.1.5, 4.1
 Architectures: amd64, arm32v7, arm64v8
-GitCommit: 28b986eccdcf136c1a6f705cab132abf63e88a56
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.1/bullseye
 
 Tags: 4.1.5-windowsservercore-1809, 4.1-windowsservercore-1809
@@ -83,33 +83,33 @@ Constraints: windowsservercore-ltsc2022
 
 Tags: 4.2.5-alpine3.17, 4.2-alpine3.17
 Architectures: amd64, arm64v8
-GitCommit: 28b986eccdcf136c1a6f705cab132abf63e88a56
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.2/alpine3.17
 
 Tags: 4.2.5-alpine3.18, 4.2-alpine3.18
 Architectures: amd64, arm64v8
-GitCommit: 28b986eccdcf136c1a6f705cab132abf63e88a56
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.2/alpine3.18
 
 Tags: 4.2.5-alpine3.19, 4.2-alpine3.19
 Architectures: amd64, arm64v8
-GitCommit: 28b986eccdcf136c1a6f705cab132abf63e88a56
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.2/alpine3.19
 
 Tags: 4.2.5-alpine3.20, 4.2-alpine3.20, 4.2.5-alpine, 4.2-alpine
 Architectures: amd64, arm64v8
-GitCommit: 28b986eccdcf136c1a6f705cab132abf63e88a56
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.2/alpine3.20
 
 Tags: 4.2.5-bookworm, 4.2-bookworm
 SharedTags: 4.2.5, 4.2
 Architectures: amd64, arm32v7, arm64v8
-GitCommit: 28b986eccdcf136c1a6f705cab132abf63e88a56
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.2/bookworm
 
 Tags: 4.2.5-bullseye, 4.2-bullseye
 Architectures: amd64, arm32v7, arm64v8
-GitCommit: 28b986eccdcf136c1a6f705cab132abf63e88a56
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.2/bullseye
 
 Tags: 4.2.5-windowsservercore-1809, 4.2-windowsservercore-1809
@@ -128,33 +128,33 @@ Constraints: windowsservercore-ltsc2022
 
 Tags: 4.3.6-alpine3.17, 4.3-alpine3.17
 Architectures: amd64, arm64v8
-GitCommit: 03cdd3f2df8800aff8f28313181564ed9443dedd
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.3/alpine3.17
 
 Tags: 4.3.6-alpine3.18, 4.3-alpine3.18
 Architectures: amd64, arm64v8
-GitCommit: 03cdd3f2df8800aff8f28313181564ed9443dedd
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.3/alpine3.18
 
 Tags: 4.3.6-alpine3.19, 4.3-alpine3.19
 Architectures: amd64, arm64v8
-GitCommit: 03cdd3f2df8800aff8f28313181564ed9443dedd
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.3/alpine3.19
 
 Tags: 4.3.6-alpine3.20, 4.3-alpine3.20, 4.3.6-alpine, 4.3-alpine
 Architectures: amd64, arm64v8
-GitCommit: 03cdd3f2df8800aff8f28313181564ed9443dedd
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.3/alpine3.20
 
 Tags: 4.3.6-bookworm, 4.3-bookworm
 SharedTags: 4.3.6, 4.3, latest
 Architectures: amd64, arm32v7, arm64v8
-GitCommit: 03cdd3f2df8800aff8f28313181564ed9443dedd
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.3/bookworm
 
 Tags: 4.3.6-bullseye, 4.3-bullseye
 Architectures: amd64, arm32v7, arm64v8
-GitCommit: 03cdd3f2df8800aff8f28313181564ed9443dedd
+GitCommit: 483c3e2b958d83239d03f4469ea9e745c0852326
 Directory: 4.3/bullseye
 
 Tags: 4.3.6-windowsservercore-1809, 4.3-windowsservercore-1809
diff --git a/haxe_4.0-alpine/Dockerfile b/haxe_4.0-alpine/Dockerfile
index 66ac4b8..7d35ed5 100644
--- a/haxe_4.0-alpine/Dockerfile
+++ b/haxe_4.0-alpine/Dockerfile
@@ -69,7 +69,9 @@ RUN set -ex \
 		ocaml-ocamldoc \
 	&& opam init --compiler=4.11.0 --disable-sandboxing \
 	&& eval $(opam env) \
+	\
 	&& opam pin add extlib 1.7.7 --no-action \
+	\
 	&& opam install . --deps-only --no-depexts --yes \
 	&& make \
 	&& eval $(opam env --revert) \
diff --git a/haxe_4.0-alpine3.17/Dockerfile b/haxe_4.0-alpine3.17/Dockerfile
index ebbe6ee..7f72319 100644
--- a/haxe_4.0-alpine3.17/Dockerfile
+++ b/haxe_4.0-alpine3.17/Dockerfile
@@ -69,7 +69,9 @@ RUN set -ex \
 		ocaml-ocamldoc \
 	&& opam init --compiler=4.11.0 --disable-sandboxing \
 	&& eval $(opam env) \
+	\
 	&& opam pin add extlib 1.7.7 --no-action \
+	\
 	&& opam install . --deps-only --no-depexts --yes \
 	&& make \
 	&& eval $(opam env --revert) \
diff --git a/haxe_4.0-alpine3.18/Dockerfile b/haxe_4.0-alpine3.18/Dockerfile
index 9e4069c..1bc3aca 100644
--- a/haxe_4.0-alpine3.18/Dockerfile
+++ b/haxe_4.0-alpine3.18/Dockerfile
@@ -69,7 +69,9 @@ RUN set -ex \
 		ocaml-ocamldoc \
 	&& opam init --compiler=4.11.0 --disable-sandboxing \
 	&& eval $(opam env) \
+	\
 	&& opam pin add extlib 1.7.7 --no-action \
+	\
 	&& opam install . --deps-only --no-depexts --yes \
 	&& make \
 	&& eval $(opam env --revert) \
diff --git a/haxe_4.0-alpine3.19/Dockerfile b/haxe_4.0-alpine3.19/Dockerfile
index eba234f..6833e62 100644
--- a/haxe_4.0-alpine3.19/Dockerfile
+++ b/haxe_4.0-alpine3.19/Dockerfile
@@ -69,7 +69,9 @@ RUN set -ex \
 		ocaml-ocamldoc \
 	&& opam init --compiler=4.11.0 --disable-sandboxing \
 	&& eval $(opam env) \
+	\
 	&& opam pin add extlib 1.7.7 --no-action \
+	\
 	&& opam install . --deps-only --no-depexts --yes \
 	&& make \
 	&& eval $(opam env --revert) \
diff --git a/haxe_4.0-bullseye/Dockerfile b/haxe_4.0-bullseye/Dockerfile
index 4c44d6b..2c01e0c 100644
--- a/haxe_4.0-bullseye/Dockerfile
+++ b/haxe_4.0-bullseye/Dockerfile
@@ -84,7 +84,9 @@ RUN set -ex \
 	\
 	&& opam init --disable-sandboxing \
 	&& eval `opam env` \
+	\
 	&& opam pin add extlib 1.7.7 --no-action \
+	\
 	&& ( [ -f /usr/src/haxe/opam ] || [ -f /usr/src/haxe/haxe.opam ] && opam install /usr/src/haxe --deps-only --yes || make opam_install ) \
 	&& make all tools \
 	&& mkdir -p /usr/local/bin \
diff --git a/haxe_4.1-alpine/Dockerfile b/haxe_4.1-alpine/Dockerfile
index 7844779..4f42e5d 100644
--- a/haxe_4.1-alpine/Dockerfile
+++ b/haxe_4.1-alpine/Dockerfile
@@ -69,7 +69,9 @@ RUN set -ex \
 		ocaml-ocamldoc \
 	&& opam init --compiler=4.11.0 --disable-sandboxing \
 	&& eval $(opam env) \
+	\
 	&& opam pin add extlib 1.7.7 --no-action \
+	\
 	&& opam install . --deps-only --no-depexts --yes \
 	&& make \
 	&& eval $(opam env --revert) \
diff --git a/haxe_4.1-alpine3.17/Dockerfile b/haxe_4.1-alpine3.17/Dockerfile
index 02f90df..a5510c1 100644
--- a/haxe_4.1-alpine3.17/Dockerfile
+++ b/haxe_4.1-alpine3.17/Dockerfile
@@ -69,7 +69,9 @@ RUN set -ex \
 		ocaml-ocamldoc \
 	&& opam init --compiler=4.11.0 --disable-sandboxing \
 	&& eval $(opam env) \
+	\
 	&& opam pin add extlib 1.7.7 --no-action \
+	\
 	&& opam install . --deps-only --no-depexts --yes \
 	&& make \
 	&& eval $(opam env --revert) \
diff --git a/haxe_4.1-alpine3.18/Dockerfile b/haxe_4.1-alpine3.18/Dockerfile
index 047ad38..aec2d6a 100644
--- a/haxe_4.1-alpine3.18/Dockerfile
+++ b/haxe_4.1-alpine3.18/Dockerfile
@@ -69,7 +69,9 @@ RUN set -ex \
 		ocaml-ocamldoc \
 	&& opam init --compiler=4.11.0 --disable-sandboxing \
 	&& eval $(opam env) \
+	\
 	&& opam pin add extlib 1.7.7 --no-action \
+	\
 	&& opam install . --deps-only --no-depexts --yes \
 	&& make \
 	&& eval $(opam env --revert) \
diff --git a/haxe_4.1-alpine3.19/Dockerfile b/haxe_4.1-alpine3.19/Dockerfile
index 1fe98c1..e96980f 100644
--- a/haxe_4.1-alpine3.19/Dockerfile
+++ b/haxe_4.1-alpine3.19/Dockerfile
@@ -69,7 +69,9 @@ RUN set -ex \
 		ocaml-ocamldoc \
 	&& opam init --compiler=4.11.0 --disable-sandboxing \
 	&& eval $(opam env) \
+	\
 	&& opam pin add extlib 1.7.7 --no-action \
+	\
 	&& opam install . --deps-only --no-depexts --yes \
 	&& make \
 	&& eval $(opam env --revert) \
diff --git a/haxe_4.1-bullseye/Dockerfile b/haxe_4.1-bullseye/Dockerfile
index e09a934..7a5e078 100644
--- a/haxe_4.1-bullseye/Dockerfile
+++ b/haxe_4.1-bullseye/Dockerfile
@@ -84,7 +84,9 @@ RUN set -ex \
 	\
 	&& opam init --disable-sandboxing \
 	&& eval `opam env` \
+	\
 	&& opam pin add extlib 1.7.7 --no-action \
+	\
 	&& ( [ -f /usr/src/haxe/opam ] || [ -f /usr/src/haxe/haxe.opam ] && opam install /usr/src/haxe --deps-only --yes || make opam_install ) \
 	&& make all tools \
 	&& mkdir -p /usr/local/bin \
diff --git a/haxe_4.2-alpine/Dockerfile b/haxe_4.2-alpine/Dockerfile
index 151502b..b7874df 100644
--- a/haxe_4.2-alpine/Dockerfile
+++ b/haxe_4.2-alpine/Dockerfile
@@ -70,6 +70,8 @@ RUN set -ex \
 	&& opam init --compiler=4.11.0 --disable-sandboxing \
 	&& eval $(opam env) \
 	\
+	&& opam pin add extlib 1.7.9 --no-action \
+	\
 	&& opam install . --deps-only --no-depexts --yes \
 	&& make \
 	&& eval $(opam env --revert) \
diff --git a/haxe_4.2-alpine3.17/Dockerfile b/haxe_4.2-alpine3.17/Dockerfile
index 12cbfc1..3e52d99 100644
--- a/haxe_4.2-alpine3.17/Dockerfile
+++ b/haxe_4.2-alpine3.17/Dockerfile
@@ -70,6 +70,8 @@ RUN set -ex \
 	&& opam init --compiler=4.11.0 --disable-sandboxing \
 	&& eval $(opam env) \
 	\
+	&& opam pin add extlib 1.7.9 --no-action \
+	\
 	&& opam install . --deps-only --no-depexts --yes \
 	&& make \
 	&& eval $(opam env --revert) \
diff --git a/haxe_4.2-alpine3.18/Dockerfile b/haxe_4.2-alpine3.18/Dockerfile
index b0dec01..3312a76 100644
--- a/haxe_4.2-alpine3.18/Dockerfile
+++ b/haxe_4.2-alpine3.18/Dockerfile
@@ -70,6 +70,8 @@ RUN set -ex \
 	&& opam init --compiler=4.11.0 --disable-sandboxing \
 	&& eval $(opam env) \
 	\
+	&& opam pin add extlib 1.7.9 --no-action \
+	\
 	&& opam install . --deps-only --no-depexts --yes \
 	&& make \
 	&& eval $(opam env --revert) \
diff --git a/haxe_4.2-alpine3.19/Dockerfile b/haxe_4.2-alpine3.19/Dockerfile
index f070eee..eb55bc7 100644
--- a/haxe_4.2-alpine3.19/Dockerfile
+++ b/haxe_4.2-alpine3.19/Dockerfile
@@ -70,6 +70,8 @@ RUN set -ex \
 	&& opam init --compiler=4.11.0 --disable-sandboxing \
 	&& eval $(opam env) \
 	\
+	&& opam pin add extlib 1.7.9 --no-action \
+	\
 	&& opam install . --deps-only --no-depexts --yes \
 	&& make \
 	&& eval $(opam env --revert) \
diff --git a/haxe_4.2-bookworm/Dockerfile b/haxe_4.2-bookworm/Dockerfile
index db622d9..4e825c4 100644
--- a/haxe_4.2-bookworm/Dockerfile
+++ b/haxe_4.2-bookworm/Dockerfile
@@ -85,6 +85,8 @@ RUN set -ex \
 	&& opam init --disable-sandboxing \
 	&& eval `opam env` \
 	\
+	&& opam pin add extlib 1.7.9 --no-action \
+	\
 	&& ( [ -f /usr/src/haxe/opam ] || [ -f /usr/src/haxe/haxe.opam ] && opam install /usr/src/haxe --deps-only --assume-depexts --yes || make opam_install ) \
 	&& make all tools \
 	&& mkdir -p /usr/local/bin \
diff --git a/haxe_4.2-bullseye/Dockerfile b/haxe_4.2-bullseye/Dockerfile
index 17325a6..f4fa520 100644
--- a/haxe_4.2-bullseye/Dockerfile
+++ b/haxe_4.2-bullseye/Dockerfile
@@ -85,6 +85,8 @@ RUN set -ex \
 	&& opam init --disable-sandboxing \
 	&& eval `opam env` \
 	\
+	&& opam pin add extlib 1.7.9 --no-action \
+	\
 	&& ( [ -f /usr/src/haxe/opam ] || [ -f /usr/src/haxe/haxe.opam ] && opam install /usr/src/haxe --deps-only --yes || make opam_install ) \
 	&& make all tools \
 	&& mkdir -p /usr/local/bin \
diff --git a/haxe_4.3-alpine/Dockerfile b/haxe_4.3-alpine/Dockerfile
index 5504d74..d096030 100644
--- a/haxe_4.3-alpine/Dockerfile
+++ b/haxe_4.3-alpine/Dockerfile
@@ -70,6 +70,8 @@ RUN set -ex \
 	&& opam init --compiler=4.11.0 --disable-sandboxing \
 	&& eval $(opam env) \
 	\
+	&& opam pin add extlib 1.7.9 --no-action \
+	\
 	&& opam install . --deps-only --no-depexts --yes \
 	&& make \
 	&& eval $(opam env --revert) \
diff --git a/haxe_4.3-alpine3.17/Dockerfile b/haxe_4.3-alpine3.17/Dockerfile
index 05c284d..dc9f296 100644
--- a/haxe_4.3-alpine3.17/Dockerfile
+++ b/haxe_4.3-alpine3.17/Dockerfile
@@ -70,6 +70,8 @@ RUN set -ex \
 	&& opam init --compiler=4.11.0 --disable-sandboxing \
 	&& eval $(opam env) \
 	\
+	&& opam pin add extlib 1.7.9 --no-action \
+	\
 	&& opam install . --deps-only --no-depexts --yes \
 	&& make \
 	&& eval $(opam env --revert) \
diff --git a/haxe_4.3-alpine3.18/Dockerfile b/haxe_4.3-alpine3.18/Dockerfile
index ee61800..7954c7e 100644
--- a/haxe_4.3-alpine3.18/Dockerfile
+++ b/haxe_4.3-alpine3.18/Dockerfile
@@ -70,6 +70,8 @@ RUN set -ex \
 	&& opam init --compiler=4.11.0 --disable-sandboxing \
 	&& eval $(opam env) \
 	\
+	&& opam pin add extlib 1.7.9 --no-action \
+	\
 	&& opam install . --deps-only --no-depexts --yes \
 	&& make \
 	&& eval $(opam env --revert) \
diff --git a/haxe_4.3-alpine3.19/Dockerfile b/haxe_4.3-alpine3.19/Dockerfile
index 23747a9..46babca 100644
--- a/haxe_4.3-alpine3.19/Dockerfile
+++ b/haxe_4.3-alpine3.19/Dockerfile
@@ -70,6 +70,8 @@ RUN set -ex \
 	&& opam init --compiler=4.11.0 --disable-sandboxing \
 	&& eval $(opam env) \
 	\
+	&& opam pin add extlib 1.7.9 --no-action \
+	\
 	&& opam install . --deps-only --no-depexts --yes \
 	&& make \
 	&& eval $(opam env --revert) \
diff --git a/haxe_4.3-bookworm/Dockerfile b/haxe_4.3-bookworm/Dockerfile
index c0db9e6..d10eb23 100644
--- a/haxe_4.3-bookworm/Dockerfile
+++ b/haxe_4.3-bookworm/Dockerfile
@@ -85,6 +85,8 @@ RUN set -ex \
 	&& opam init --disable-sandboxing \
 	&& eval `opam env` \
 	\
+	&& opam pin add extlib 1.7.9 --no-action \
+	\
 	&& ( [ -f /usr/src/haxe/opam ] || [ -f /usr/src/haxe/haxe.opam ] && opam install /usr/src/haxe --deps-only --assume-depexts --yes || make opam_install ) \
 	&& make all tools \
 	&& mkdir -p /usr/local/bin \
diff --git a/haxe_4.3-bullseye/Dockerfile b/haxe_4.3-bullseye/Dockerfile
index ac2636c..5381d47 100644
--- a/haxe_4.3-bullseye/Dockerfile
+++ b/haxe_4.3-bullseye/Dockerfile
@@ -85,6 +85,8 @@ RUN set -ex \
 	&& opam init --disable-sandboxing \
 	&& eval `opam env` \
 	\
+	&& opam pin add extlib 1.7.9 --no-action \
+	\
 	&& ( [ -f /usr/src/haxe/opam ] || [ -f /usr/src/haxe/haxe.opam ] && opam install /usr/src/haxe --deps-only --yes || make opam_install ) \
 	&& make all tools \
 	&& mkdir -p /usr/local/bin \

Relevant Maintainers:

@yosifkit yosifkit merged commit 0d63990 into docker-library:master Oct 1, 2024
35 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yosifkit yosifkit yosifkit approved these changes

Assignees
No one assigned
Labels
library/haxe
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@andyli @yosifkit