Update CI workflow for installer (now uses latest Ubuntu)

Signed-off-by: Stefan Weil <sw@weilnetz.de>
UB-Mannheim · May 19, 2024 · 1df5ec9 · 1df5ec9
1 parent a5ff320
commit 1df5ec9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh
@@ -2,7 +2,7 @@
 
 # GitHub actions - Create Tesseract installer for Windows
 
-# Author: Stefan Weil (2010-2023)
+# Author: Stefan Weil (2010-2024)
 
 set -e
 set -x
@@ -27,14 +27,14 @@ sudo apt-get update --quiet
 sudo apt-get install --assume-yes --no-install-recommends --quiet \
   asciidoc xsltproc docbook-xml docbook-xsl \
   automake dpkg-dev libtool pkg-config default-jdk-headless \
-  mingw-w64-tools nsis g++-mingw-w64-${ARCH/_/-}
+  mingw-w64-tools nsis g++-mingw-w64-${ARCH/_/-} pacman-package-manager
 
 # Install pacman-package-manager and its dependencies (from Ubuntu 22.10).
-sudo curl -Os http://de.archive.ubuntu.com/ubuntu/pool/universe/p/pacman-package-manager/pacman-package-manager_6.0.1-4_amd64.deb
-sudo curl -Os http://de.archive.ubuntu.com/ubuntu/pool/universe/p/pacman-package-manager/libalpm13_6.0.1-4_amd64.deb
-sudo curl -Os http://de.archive.ubuntu.com/ubuntu/pool/universe/p/pacman-package-manager/makepkg_6.0.1-4_amd64.deb
-sudo dpkg -i *.deb || true
-sudo apt-get install --fix-broken --assume-yes --no-install-recommends --quiet
+# sudo curl -Os http://de.archive.ubuntu.com/ubuntu/pool/universe/p/pacman-package-manager/pacman-package-manager_6.0.1-4_amd64.deb
+# sudo curl -Os http://de.archive.ubuntu.com/ubuntu/pool/universe/p/pacman-package-manager/libalpm13_6.0.1-4_amd64.deb
+# sudo curl -Os http://de.archive.ubuntu.com/ubuntu/pool/universe/p/pacman-package-manager/makepkg_6.0.1-4_amd64.deb
+# sudo dpkg -i *.deb || true
+# sudo apt-get install --fix-broken --assume-yes --no-install-recommends --quiet
 
 # Configure pacman.
 

diff --git a/.github/workflows/installer-for-windows.yml b/.github/workflows/installer-for-windows.yml
@@ -23,7 +23,7 @@ jobs:
   build32:
     # Disable 32 bit builds.
     if: github.repository == '_UB-Mannheim/tesseract'
-    runs-on: [ubuntu-20.04]
+    runs-on: [ubuntu-24.04]
     steps:
     - uses: actions/checkout@v4
     - name: Build Tesseract installer (32 bit)
@@ -35,7 +35,7 @@ jobs:
 
   build64:
     if: github.repository == 'UB-Mannheim/tesseract'
-    runs-on: [ubuntu-22.04]
+    runs-on: [ubuntu-24.04]
     steps:
     - uses: actions/checkout@v4
     - name: Build Tesseract installer (64 bit)