explicitly include p7zip in app builds that use it

p7zip is currently installed by default in the stretch buildserver guest.
With the work upgrading the buildserver guest to buster or newer, and the
NDK r10e package being switched to a zipball, p7zip no longer needs to be
included in the base image.

fdroidserver!927
This commit is contained in:
Hans-Christoph Steiner 2021-05-26 18:51:43 +02:00
parent f947fe08ea
commit 397252d66c
No known key found for this signature in database
GPG key ID: 3E177817BA1B9BFA
3 changed files with 11 additions and 11 deletions

View file

@ -47,7 +47,7 @@ Builds:
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install --yes librsvg2-bin
- apt-get install --yes librsvg2-bin p7zip
- apt-get -t stretch-backports-sloppy install libarchive13
- apt-get -t stretch-backports install cmake
patch:

View file

@ -23,7 +23,7 @@ Builds:
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install --yes extra-cmake-modules libncurses5
- apt-get install --yes extra-cmake-modules libncurses5 p7zip
output: android-build/android/bin/GCompris-Android-release-armeabi-v7a-dl-$$VERSION$$.apk
prebuild: mkdir qt/ android-build/
scandelete:
@ -77,7 +77,7 @@ Builds:
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install --yes libncurses5 -t stretch-backports cmake
- apt-get install --yes libncurses5 -t stretch-backports cmake p7zip
output: android-build/android/GCompris-Android-release-armeabi-v7a-dl-$$VERSION$$.apk
srclibs:
- extra-cmake-modules@v5.63.0

View file

@ -33,7 +33,7 @@ Builds:
commit: v3.7.1
sudo:
- apt-get update || apt-get update
- apt-get install -y docbook-xsl
- apt-get install -y docbook-xsl p7zip
output: android-build/kid3/android/bin/QtApp-release-unsigned.apk
target: android-19
build:
@ -59,7 +59,7 @@ Builds:
commit: v3.8.0
sudo:
- apt-get update || apt-get update
- apt-get install -y docbook-xsl
- apt-get install -y docbook-xsl p7zip
output: android-build/kid3/android/build/outputs/apk/release/android-release-unsigned.apk
target: android-22
build:
@ -85,7 +85,7 @@ Builds:
commit: v3.8.1
sudo:
- apt-get update || apt-get update
- apt-get install -y docbook-xsl
- apt-get install -y docbook-xsl p7zip
output: android-build/kid3/android/build/outputs/apk/release/android-release-unsigned.apk
target: android-22
build:
@ -111,7 +111,7 @@ Builds:
commit: v3.8.2
sudo:
- apt-get update || apt-get update
- apt-get install -y docbook-xsl
- apt-get install -y docbook-xsl p7zip
output: android-build/kid3/android/build/outputs/apk/release/android-release-unsigned.apk
target: android-22
build:
@ -137,7 +137,7 @@ Builds:
commit: v3.8.3
sudo:
- apt-get update || apt-get update
- apt-get install -y docbook-xsl
- apt-get install -y docbook-xsl p7zip
output: android-build/kid3/android/build/outputs/apk/release/android-release-unsigned.apk
target: android-22
build:
@ -163,7 +163,7 @@ Builds:
commit: v3.8.4
sudo:
- apt-get update || apt-get update
- apt-get install -y docbook-xsl
- apt-get install -y docbook-xsl p7zip
output: android-build/kid3/android/build/outputs/apk/release/android-release-unsigned.apk
target: android-22
build:
@ -189,7 +189,7 @@ Builds:
commit: v3.8.5
sudo:
- apt-get update || apt-get update
- apt-get install -y docbook-xsl
- apt-get install -y docbook-xsl p7zip
output: android-build/kid3/android/build/outputs/apk/release/android-release-unsigned.apk
target: android-22
build:
@ -215,7 +215,7 @@ Builds:
commit: v3.8.6
sudo:
- apt-get update || apt-get update
- apt-get install -y docbook-xsl
- apt-get install -y docbook-xsl p7zip
output: android-build/kid3/android/build/outputs/apk/release/android-release-unsigned.apk
target: android-22
build: