From f9376b48540c0ed6eb9c13d1925fba2965d7cb6f Mon Sep 17 00:00:00 2001 From: Colin Clark Date: Tue, 5 Sep 2023 14:59:51 +0100 Subject: [PATCH] Bug fix: Some secondary files were not included in x86 AppImages Due to an old version of meson being used. --- .github/workflows/appimage-aarch64.yml | 1 + .github/workflows/appimage-minimal-aarch64.yml | 1 + .github/workflows/appimage-minimal-x86_64.yml | 3 ++- .github/workflows/appimage-x86_64.yml | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/appimage-aarch64.yml b/.github/workflows/appimage-aarch64.yml index fb87dfc3..6aa46052 100644 --- a/.github/workflows/appimage-aarch64.yml +++ b/.github/workflows/appimage-aarch64.yml @@ -39,6 +39,7 @@ jobs: yes | sudo apt-get install libpoppler-glib-dev yes | sudo apt-get install libraw-dev libomp-dev yes | sudo apt-get install libwebp-dev + yes | sudo apt-get install gettext yes | sudo apt-get install git yes | sudo apt-get install python3 python3-pip python3-setuptools python3-wheel ninja-build yes | sudo apt-get install meson diff --git a/.github/workflows/appimage-minimal-aarch64.yml b/.github/workflows/appimage-minimal-aarch64.yml index 211998d8..30f5cfb1 100644 --- a/.github/workflows/appimage-minimal-aarch64.yml +++ b/.github/workflows/appimage-minimal-aarch64.yml @@ -27,6 +27,7 @@ jobs: commands: | yes | sudo apt-get update yes | sudo apt-get install build-essential libgtk-3-dev libgtk-3-bin + yes | sudo apt-get install gettext yes | sudo apt-get install git yes | sudo apt-get install python3 python3-pip python3-setuptools python3-wheel ninja-build yes | sudo apt-get install meson diff --git a/.github/workflows/appimage-minimal-x86_64.yml b/.github/workflows/appimage-minimal-x86_64.yml index 4e2aa934..c35a8c5d 100644 --- a/.github/workflows/appimage-minimal-x86_64.yml +++ b/.github/workflows/appimage-minimal-x86_64.yml @@ -7,6 +7,7 @@ jobs: steps: - run: sudo apt-get update - run: sudo apt-get install build-essential libgtk-3-dev libgtk-3-bin + - run: sudo apt-get install gettext - uses: actions/checkout@v3 - run: git fetch --tags --force @@ -17,7 +18,7 @@ jobs: directory: build setup-options: -Darchive=disabled -Dcms=disabled -Ddevel=disabled -Ddoxygen=disabled -Ddjvu=disabled -Devince=disabled -Dexecinfo=disabled -Dexiv2=disabled -Dgit=disabled -Dgps-map=disabled -Dheif=disabled -Dj2k=disabled -Djpeg=disabled -Djpegxl=disabled -Dlibraw=disabled -Dlua=disabled -Dpandoc=disabled -Dpdf=disabled -Dspell=disabled -Dtiff=disabled -Dvideothumbnailer=disabled -Dwebp=disabled -Dyelp-build=disabled options: --verbose - meson-version: 0.56.2 + meson-version: 1.0.1 - name: build run: DESTDIR=/home/runner/work/geeqie/geeqie/AppDir ninja -C build install diff --git a/.github/workflows/appimage-x86_64.yml b/.github/workflows/appimage-x86_64.yml index b967c100..2d228c5e 100644 --- a/.github/workflows/appimage-x86_64.yml +++ b/.github/workflows/appimage-x86_64.yml @@ -17,6 +17,7 @@ jobs: - run: sudo apt-get install libpoppler-glib-dev - run: sudo apt-get install libraw-dev libomp-dev - run: sudo apt-get install libwebp-dev + - run: sudo apt-get install gettext - uses: actions/checkout@v3 - run: git fetch --tags --force @@ -27,7 +28,7 @@ jobs: directory: build setup-options: -Dgit=disabled options: --verbose - meson-version: 0.56.2 + meson-version: 1.0.1 - name: build run: DESTDIR=/home/runner/work/geeqie/geeqie/AppDir ninja -C build install -- 2.20.1