From: Colin Clark Date: Sun, 21 Apr 2024 12:39:18 +0000 (+0100) Subject: Tidy AppImage generation files X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=831dd3383c7b7be041b03b614f0ad04b763c4728 Tidy AppImage generation files --- diff --git a/.github/workflows/appimage-aarch64.yml b/.github/workflows/appimage-aarch64.yml index e29e12eb..1d7b65bf 100644 --- a/.github/workflows/appimage-aarch64.yml +++ b/.github/workflows/appimage-aarch64.yml @@ -31,6 +31,8 @@ jobs: yes | sudo apt-get update yes | sudo apt-get install build-essential libgtk-3-dev libgtk-3-bin yes | sudo apt-get install evince + yes | sudo apt-get install gettext + yes | sudo apt-get install git yes | sudo apt-get install libarchive-dev yes | sudo apt-get install libchamplain-0.12-dev libchamplain-gtk-0.12-dev yes | sudo apt-get install libdw-dev @@ -44,11 +46,9 @@ jobs: yes | sudo apt-get install libraw-dev libomp-dev yes | sudo apt-get install libunwind-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 yes | sudo apt-get install pandoc + yes | sudo apt-get install python3 python3-pip python3-setuptools python3-wheel ninja-build yes | sudo apt-get install yelp-tools mkdir -p $GITHUB_WORKSPACE/AppDir mkdir -p $GITHUB_WORKSPACE/AppDir/usr diff --git a/.github/workflows/appimage-minimal-aarch64.yml b/.github/workflows/appimage-minimal-aarch64.yml index c165778f..08036b43 100644 --- a/.github/workflows/appimage-minimal-aarch64.yml +++ b/.github/workflows/appimage-minimal-aarch64.yml @@ -30,10 +30,9 @@ jobs: 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 yes | sudo apt-get install pandoc - yes | sudo apt-get install gettext + yes | sudo apt-get install python3 python3-pip python3-setuptools python3-wheel ninja-build yes | sudo apt-get install yelp-tools mkdir -p $GITHUB_WORKSPACE/AppDir mkdir -p $GITHUB_WORKSPACE/AppDir/usr diff --git a/.github/workflows/appimage-minimal-x86_64.yml b/.github/workflows/appimage-minimal-x86_64.yml index 125adf01..c8332907 100644 --- a/.github/workflows/appimage-minimal-x86_64.yml +++ b/.github/workflows/appimage-minimal-x86_64.yml @@ -7,8 +7,8 @@ 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 pandoc - run: sudo apt-get install gettext + - run: sudo apt-get install pandoc - run: sudo apt-get install yelp-tools - uses: actions/checkout@v3 @@ -19,12 +19,36 @@ jobs: with: action: build directory: build - setup-options: -Darchive=disabled -Dcms=disabled -Ddevel=disabled -Ddoxygen=disabled -Ddjvu=disabled -Devince=disabled -Dexecinfo=disabled -Dexiv2=disabled -Dgps-map=disabled -Dheif=disabled -Dj2k=disabled -Djpeg=disabled -Djpegxl=disabled -Dlibraw=disabled -Dlua=disabled -Dpdf=disabled -Dspell=disabled -Dtiff=disabled -Dvideothumbnailer=disabled -Dwebp=disabled + setup-options: > + -Darchive=disabled + -Dcms=disabled + -Ddevel=disabled + -Ddjvu=disabled + -Ddoxygen=disabled + -Devince=disabled + -Dexecinfo=disabled + -Dexiv2=disabled + -Dgit=disabled + -Dgps-map=disabled + -Dgtk4=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: 1.0.1 - name: build - run: DESTDIR=/home/runner/work/geeqie/geeqie/AppDir ninja -C build install + run: DESTDIR=${{ github.workspace }}/AppDir ninja -C build install - name: build AppImage uses: AppImageCrafters/build-appimage-action@master with: @@ -44,5 +68,5 @@ jobs: if: always() with: name: logs-all-build-appimage - path: /home/runner/work/geeqie/geeqie/build/meson-logs/*.txt + path: ${{ github.workspace }}/build/meson-logs/*.txt retention-days: 5 diff --git a/.github/workflows/appimage-x86_64.yml b/.github/workflows/appimage-x86_64.yml index fd9f32f8..dd5f32d4 100644 --- a/.github/workflows/appimage-x86_64.yml +++ b/.github/workflows/appimage-x86_64.yml @@ -8,6 +8,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get install build-essential libgtk-3-dev libgtk-3-bin - run: sudo apt-get install evince + - run: sudo apt-get install gettext - run: sudo apt-get install libarchive-dev - run: sudo apt-get install libchamplain-0.12-dev libchamplain-gtk-0.12-dev - run: sudo apt-get install libdw-dev @@ -20,10 +21,9 @@ jobs: - run: sudo apt-get install libpoppler-glib-dev - run: sudo apt-get install libraw-dev libomp-dev - run: sudo apt-get install libunwind-dev - - run: sudo apt-get install libwebp7 - run: sudo apt-get install libwebp-dev + - run: sudo apt-get install libwebp7 - run: sudo apt-get install pandoc - - run: sudo apt-get install gettext - run: sudo apt-get install yelp-tools - uses: actions/checkout@v3 @@ -39,7 +39,7 @@ jobs: meson-version: 1.0.1 - name: build - run: DESTDIR=/home/runner/work/geeqie/geeqie/AppDir ninja -C build install + run: DESTDIR=${{ github.workspace }}/AppDir ninja -C build install - name: build AppImage uses: AppImageCrafters/build-appimage-action@master with: @@ -59,5 +59,5 @@ jobs: if: always() with: name: logs-all-build-appimage - path: /home/runner/work/geeqie/geeqie/build/meson-logs/*.txt + path: ${{ github.workspace }}/build/meson-logs/*.txt retention-days: 5 diff --git a/AppImageBuilder-aarch64.yml b/AppImageBuilder-aarch64.yml index 545a8e3f..ceb8333e 100644 --- a/AppImageBuilder-aarch64.yml +++ b/AppImageBuilder-aarch64.yml @@ -20,8 +20,8 @@ AppDir: allow_unauthenticated: true sources: - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted - - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy universe + - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates universe include: - evince @@ -47,14 +47,14 @@ AppDir: files: include: [] exclude: - - usr/share/man - - usr/share/doc/*/README.* - - usr/share/doc/*/changelog.* - - usr/share/doc/*/NEWS.* - - usr/share/doc/*/TODO.* - - usr/lib/libuim-scm.so.0 - usr/lib/gtk-3.0/3.0.0/immodules/im-uim.so - usr/lib/im-uim.so + - usr/lib/libuim-scm.so.0 - usr/lib/libuim.so.8 + - usr/share/doc/*/NEWS.* + - usr/share/doc/*/README.* + - usr/share/doc/*/TODO.* + - usr/share/doc/*/changelog.* + - usr/share/man AppImage: arch: aarch64 diff --git a/AppImageBuilder-x86_64.yml b/AppImageBuilder-x86_64.yml index ea4bae87..40b62720 100644 --- a/AppImageBuilder-x86_64.yml +++ b/AppImageBuilder-x86_64.yml @@ -6,7 +6,7 @@ script: - which mksquashfs || apt install squashfs-tools AppDir: - path: /home/runner/work/geeqie/geeqie/AppDir/ + path: ./AppDir app_info: id: geeqie name: Geeqie @@ -20,8 +20,8 @@ AppDir: allow_unauthenticated: true sources: - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ jammy main restricted - - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ jammy-updates main restricted - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ jammy universe + - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ jammy-updates main restricted - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ jammy-updates universe include: - evince @@ -48,14 +48,14 @@ AppDir: files: include: [] exclude: - - usr/share/man - - usr/share/doc/*/README.* - - usr/share/doc/*/changelog.* - - usr/share/doc/*/NEWS.* - - usr/share/doc/*/TODO.* - - usr/lib/libuim-scm.so.0 - usr/lib/gtk-3.0/3.0.0/immodules/im-uim.so - usr/lib/im-uim.so + - usr/lib/libuim-scm.so.0 - usr/lib/libuim.so.8 + - usr/share/doc/*/NEWS.* + - usr/share/doc/*/README.* + - usr/share/doc/*/TODO.* + - usr/share/doc/*/changelog.* + - usr/share/man AppImage: arch: x86_64 diff --git a/AppImageBuilderMinimal-aarch64.yml b/AppImageBuilderMinimal-aarch64.yml index 7296ae03..d79a29d5 100644 --- a/AppImageBuilderMinimal-aarch64.yml +++ b/AppImageBuilderMinimal-aarch64.yml @@ -20,8 +20,8 @@ AppDir: allow_unauthenticated: true sources: - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted - - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy universe + - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates universe include: - libtiff5 @@ -29,14 +29,14 @@ AppDir: files: include: [] exclude: - - usr/share/man - - usr/share/doc/*/README.* - - usr/share/doc/*/changelog.* - - usr/share/doc/*/NEWS.* - - usr/share/doc/*/TODO.* - - usr/lib/libuim-scm.so.0 - usr/lib/gtk-3.0/3.0.0/immodules/im-uim.so - usr/lib/im-uim.so + - usr/lib/libuim-scm.so.0 - usr/lib/libuim.so.8 + - usr/share/doc/*/NEWS.* + - usr/share/doc/*/README.* + - usr/share/doc/*/TODO.* + - usr/share/doc/*/changelog.* + - usr/share/man AppImage: arch: aarch64 diff --git a/AppImageBuilderMinimal-x86_64.yml b/AppImageBuilderMinimal-x86_64.yml index cfe9a58c..5d9dc7e4 100644 --- a/AppImageBuilderMinimal-x86_64.yml +++ b/AppImageBuilderMinimal-x86_64.yml @@ -6,7 +6,7 @@ script: - which mksquashfs || apt install squashfs-tools AppDir: - path: /home/runner/work/geeqie/geeqie/AppDir/ + path: ./AppDir app_info: id: geeqie name: Geeqie @@ -20,8 +20,8 @@ AppDir: allow_unauthenticated: true sources: - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ jammy main restricted - - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ jammy-updates main restricted - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ jammy universe + - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ jammy-updates main restricted - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ jammy-updates universe include: - libtiff5 @@ -29,14 +29,14 @@ AppDir: files: include: [] exclude: - - usr/share/man - - usr/share/doc/*/README.* - - usr/share/doc/*/changelog.* - - usr/share/doc/*/NEWS.* - - usr/share/doc/*/TODO.* - - usr/lib/libuim-scm.so.0 - usr/lib/gtk-3.0/3.0.0/immodules/im-uim.so - usr/lib/im-uim.so + - usr/lib/libuim-scm.so.0 - usr/lib/libuim.so.8 + - usr/share/doc/*/NEWS.* + - usr/share/doc/*/README.* + - usr/share/doc/*/TODO.* + - usr/share/doc/*/changelog.* + - usr/share/man AppImage: arch: x86_64