Skip to content

Commit 6fe20c8

Browse files
committed
Update CI workflow for installer (now uses latest Ubuntu)
Signed-off-by: Stefan Weil <[email protected]>
1 parent a5ff320 commit 6fe20c8

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

.github/workflows/build.sh

+8-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# GitHub actions - Create Tesseract installer for Windows
44

5-
# Author: Stefan Weil (2010-2023)
5+
# Author: Stefan Weil (2010-2024)
66

77
set -e
88
set -x
@@ -27,14 +27,15 @@ sudo apt-get update --quiet
2727
sudo apt-get install --assume-yes --no-install-recommends --quiet \
2828
asciidoc xsltproc docbook-xml docbook-xsl \
2929
automake dpkg-dev libtool pkg-config default-jdk-headless \
30-
mingw-w64-tools nsis g++-mingw-w64-${ARCH/_/-}
30+
mingw-w64-tools nsis g++-mingw-w64-${ARCH/_/-} \
31+
makepkg pacman-package-manager
3132

3233
# Install pacman-package-manager and its dependencies (from Ubuntu 22.10).
33-
sudo curl -Os http://de.archive.ubuntu.com/ubuntu/pool/universe/p/pacman-package-manager/pacman-package-manager_6.0.1-4_amd64.deb
34-
sudo curl -Os http://de.archive.ubuntu.com/ubuntu/pool/universe/p/pacman-package-manager/libalpm13_6.0.1-4_amd64.deb
35-
sudo curl -Os http://de.archive.ubuntu.com/ubuntu/pool/universe/p/pacman-package-manager/makepkg_6.0.1-4_amd64.deb
36-
sudo dpkg -i *.deb || true
37-
sudo apt-get install --fix-broken --assume-yes --no-install-recommends --quiet
34+
# sudo curl -Os http://de.archive.ubuntu.com/ubuntu/pool/universe/p/pacman-package-manager/pacman-package-manager_6.0.1-4_amd64.deb
35+
# sudo curl -Os http://de.archive.ubuntu.com/ubuntu/pool/universe/p/pacman-package-manager/libalpm13_6.0.1-4_amd64.deb
36+
# sudo curl -Os http://de.archive.ubuntu.com/ubuntu/pool/universe/p/pacman-package-manager/makepkg_6.0.1-4_amd64.deb
37+
# sudo dpkg -i *.deb || true
38+
# sudo apt-get install --fix-broken --assume-yes --no-install-recommends --quiet
3839

3940
# Configure pacman.
4041

.github/workflows/installer-for-windows.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
build32:
2424
# Disable 32 bit builds.
2525
if: github.repository == '_UB-Mannheim/tesseract'
26-
runs-on: [ubuntu-20.04]
26+
runs-on: [ubuntu-24.04]
2727
steps:
2828
- uses: actions/checkout@v4
2929
- name: Build Tesseract installer (32 bit)
@@ -35,7 +35,7 @@ jobs:
3535

3636
build64:
3737
if: github.repository == 'UB-Mannheim/tesseract'
38-
runs-on: [ubuntu-22.04]
38+
runs-on: [ubuntu-24.04]
3939
steps:
4040
- uses: actions/checkout@v4
4141
- name: Build Tesseract installer (64 bit)

0 commit comments

Comments
 (0)