File 0197-jinterface-Keep-jinterface-in-prebuild-using-jdk-8.patch of Package erlang
From 2cad7c98dc7c457a80ddf888334d44e31c7e329e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Backstr=C3=B6m?= <lukas@erlang.org>
Date: Wed, 18 Sep 2024 13:50:16 +0200
Subject: [PATCH 1/2] jinterface: Keep jinterface in prebuild using jdk-8
---
.github/dockerfiles/Dockerfile.ubuntu-base | 7 +++++--
.github/workflows/main.yaml | 2 ++
lib/jinterface/prebuild.keep | 1 +
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/.github/dockerfiles/Dockerfile.ubuntu-base b/.github/dockerfiles/Dockerfile.ubuntu-base
index 08b0b9bb77..f5e148fd7c 100644
--- a/.github/dockerfiles/Dockerfile.ubuntu-base
+++ b/.github/dockerfiles/Dockerfile.ubuntu-base
@@ -14,9 +14,12 @@ ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
## Install build tools
RUN apt-get update && apt-get -y upgrade && \
apt-get install -y build-essential m4 autoconf clang-format \
- default-jdk flex pkg-config locales tzdata sudo ${INSTALL_LIBS} && \
+ flex pkg-config locales tzdata sudo ${INSTALL_LIBS} && \
sed -i 's@# en_US.UTF-8@en_US.UTF-8@g' /etc/locale.gen && locale-gen && \
- update-alternatives --set wx-config /usr/lib/x86_64-linux-gnu/wx/config/gtk3-unicode-3.0
+ update-alternatives --set wx-config /usr/lib/x86_64-linux-gnu/wx/config/gtk3-unicode-3.0 && \
+ apt-get install -y openjdk-8-jdk-headless && apt-get install -y openjdk-11-jdk-headless && \
+ (update-java-alternatives -s java-1.8.0-openjdk-amd64 || true) && \
+ java -version 2>&1 | grep 'version "1[.]8' > /dev/null || exit 1
ARG MAKEFLAGS=-j4
ENV MAKEFLAGS=$MAKEFLAGS \
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 9e92f68426..1232dbf896 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -418,6 +418,8 @@ jobs:
FROM otp
ENV BASE_URL=$BASE_URL
RUN ./otp_build download_ex_doc
+ ## Need later jdk to create correct anchors in html docs
+ RUN sudo update-java-alternatives -s java-1.11.0-openjdk-amd64
RUN make release docs release_docs && sudo make install-docs
EOF
- name: Release docs to publish
diff --git a/lib/jinterface/prebuild.keep b/lib/jinterface/prebuild.keep
index 8e695ec83a..bfe7f5b60c 100644
--- a/lib/jinterface/prebuild.keep
+++ b/lib/jinterface/prebuild.keep
@@ -1 +1,2 @@
doc
+priv
--
2.43.0