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

Update OpenJDK version #90

Merged
merged 1 commit into from
Jan 23, 2025
Merged

Update OpenJDK version #90

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ubuntu-latest/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=Europe/Zurich && \
clang-format \
clang-tools \
cmake \
default-jdk-headless \
docker.io \
gcc \
gcc-mingw-w64 \
Expand All @@ -59,7 +60,6 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=Europe/Zurich && \
python3-jinja2 \
zlib1g-dev \
maven \
openjdk-11-jdk \
valgrind \
flex bison \
lsb-release software-properties-common \
Expand Down Expand Up @@ -92,5 +92,8 @@ RUN if [ "$ARCH" = "x86_64" ]; then \
echo cuPQC_DIR="/cupqc/cupqc/cupqc-pkg-0.2.0/cmake/" >> .bashrc; \
fi

# set JAVA_HOME for liboqs-java builds
ENV JAVA_HOME="/usr/lib/jvm/default-java"

# Activate if we want to test specific OpenSSL3 versions:
# RUN cd /root && git clone --depth 1 --branch openssl-3.0.7 https://github.com/openssl/openssl.git && cd openssl && LDFLAGS="-Wl,-rpath -Wl,/usr/local/openssl3/lib64" ./config --prefix=/usr/local/openssl3 && make -j && make install
# RUN cd /root && git clone --depth 1 --branch openssl-3.0.7 https://github.com/openssl/openssl.git && cd openssl && LDFLAGS="-Wl,-rpath -Wl,/usr/local/openssl3/lib64" ./config --prefix=/usr/local/openssl3 && make -j && make install
Loading