Merge branch 'develop' into java-enhanced-switch

runtimeverification · Oct 24, 2023 · 14c7b8a · 14c7b8a
2 parents 7e418f8 + b1fcdbc
commit 14c7b8a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -424,8 +424,8 @@ jobs:
       - name: 'Install pandoc/texlive/calibre'
         run: |
           sudo apt update --yes
-          sudo apt install --yes wget texlive-xetex
-          sudo wget -nv -O- https://download.calibre-ebook.com/linux-installer.sh | sh /dev/stdin version=5.44.0
+          sudo apt install --yes wget texlive-xetex libegl1 libopengl0
+          sudo wget -nv -O- https://download.calibre-ebook.com/linux-installer.sh | sh /dev/stdin version=6.29.0
           sudo wget https://github.com/jgm/pandoc/releases/download/2.18/pandoc-2.18-1-amd64.deb -O /tmp/pandoc.deb
           sudo dpkg -i /tmp/pandoc.deb
       - name: 'Checkout code and set up web build'

diff --git a/k-distribution/src/main/scripts/lib/checkJava b/k-distribution/src/main/scripts/lib/checkJava
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-MIN_VERSION="8"
+MIN_VERSION="17"
 echoerr() { echo "$@" 1>&2; }
 
 if type -p java >/dev/null; then