Skip to content

Commit

Permalink
Update CI workflow for installer (now uses latest Ubuntu)
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Weil <sw@weilnetz.de>
  • Loading branch information
stweil committed Sep 10, 2024
1 parent 1635e97 commit 9b91ca8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
15 changes: 8 additions & 7 deletions .github/workflows/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -27,14 +27,15 @@ 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/_/-} \
makepkg 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.

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/installer-for-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down

0 comments on commit 9b91ca8

Please sign in to comment.