Commit f7b51303 authored by Jochen Sprickerhof's avatar Jochen Sprickerhof
Browse files

Unify apt-get usage

- use apt-get instead of apt
- do apt-get update || apt-get update before apt-get install
- use apt install -y
parent d408af08
......@@ -42,8 +42,8 @@ Builds:
commit: v2.0.1
subdir: app
sudo:
- apt update || apt update
- apt install -y wget
- apt-get update || apt-get update
- apt-get install -y wget
gradle:
- yes
......@@ -52,8 +52,8 @@ Builds:
commit: v2.0.2
subdir: app
sudo:
- apt update || apt update
- apt install -y wget
- apt-get update || apt-get update
- apt-get install -y wget
gradle:
- yes
......@@ -62,8 +62,8 @@ Builds:
commit: v2.5.1
subdir: app
sudo:
- apt update || apt update
- apt install -y wget
- apt-get update || apt-get update
- apt-get install -y wget
gradle:
- yes
......@@ -73,8 +73,8 @@ Builds:
commit: v2.5.3
subdir: app
sudo:
- apt update || apt update
- apt install -y wget
- apt-get update || apt-get update
- apt-get install -y wget
gradle:
- yes
......@@ -83,8 +83,8 @@ Builds:
commit: v2.5.7
subdir: app
sudo:
- apt update || apt update
- apt install -y wget
- apt-get update || apt-get update
- apt-get install -y wget
gradle:
- yes
ndk: r21
......@@ -94,8 +94,8 @@ Builds:
commit: v2.6.2
subdir: app
sudo:
- apt update || apt update
- apt install -y wget
- apt-get update || apt-get update
- apt-get install -y wget
gradle:
- yes
ndk: r21
......@@ -105,8 +105,8 @@ Builds:
commit: v2.6.3
subdir: app
sudo:
- apt update || apt update
- apt install -y wget
- apt-get update || apt-get update
- apt-get install -y wget
gradle:
- yes
ndk: r21
......@@ -116,8 +116,8 @@ Builds:
commit: v2.6.4
subdir: app
sudo:
- apt update || apt update
- apt install -y wget
- apt-get update || apt-get update
- apt-get install -y wget
gradle:
- yes
ndk: r21
......@@ -127,8 +127,8 @@ Builds:
commit: v2.7.0
subdir: app
sudo:
- apt update || apt update
- apt install -y wget
- apt-get update || apt-get update
- apt-get install -y wget
gradle:
- yes
ndk: r21
......@@ -138,8 +138,8 @@ Builds:
commit: v2.7.2
subdir: app
sudo:
- apt update || apt update
- apt install -y wget
- apt-get update || apt-get update
- apt-get install -y wget
gradle:
- yes
ndk: r21
......
......@@ -17,7 +17,7 @@ Builds:
subdir: app
sudo:
- apt-get update || apt-get update
- apt install -yq ninja-build
- apt-get install -y ninja-build
gradle:
- yes
rm:
......@@ -30,7 +30,7 @@ Builds:
subdir: app
sudo:
- apt-get update || apt-get update
- apt install -yq ninja-build
- apt-get install -y ninja-build
gradle:
- yes
rm:
......
......@@ -19,7 +19,7 @@ Builds:
commit: fdroid-release-1
subdir: android/app
sudo:
- apt-get update
- apt-get update || apt-get update
- apt-get install -y g++ make ninja-build g++-multilib
- curl -Lo node.tar.xz https://nodejs.org/dist/v10.18.1/node-v10.18.1-linux-x64.tar.xz
- echo "8cc40f45c2c62529b15e83a6bbe0ac1febf57af3c5720df68067c96c0fddbbdf node.tar.xz"
......
......@@ -25,7 +25,7 @@ Builds:
subdir: app/
sudo:
- apt-get update || apt-get update
- apt-get install ninja-build
- apt-get install -y ninja-build
gradle:
- yes
srclibs:
......
......@@ -300,8 +300,8 @@ Builds:
subdir: android
submodules: true
sudo:
- apt update || apt update
- apt install -y g++
- apt-get update || apt-get update
- apt-get install -y g++
gradle:
- google
rm:
......@@ -333,8 +333,8 @@ Builds:
subdir: android
submodules: true
sudo:
- apt update || apt update
- apt install -y g++
- apt-get update || apt-get update
- apt-get install -y g++
gradle:
- google
rm:
......
......@@ -17,8 +17,8 @@ Builds:
commit: v1.3.0
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-universal-release-unsigned.apk
......@@ -29,8 +29,8 @@ Builds:
commit: v1.3.1
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-universal-release-unsigned.apk
......@@ -41,8 +41,8 @@ Builds:
commit: v1.3.2
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-universal-release-unsigned.apk
......@@ -53,8 +53,8 @@ Builds:
commit: v1.3.3
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-universal-release-unsigned.apk
......
......@@ -129,7 +129,9 @@ Builds:
disable: older failing build
commit: BS-4.7.6
subdir: android
sudo: apt-get -y install -t jessie-backports maven
sudo:
- apt-get update || apt-get update
- apt-get -y install -t jessie-backports maven
maven: 'yes'
output: target/android-4.7.6-aligned.apk
prebuild: sed -i "58iandroid:debuggable=\"false\"" AndroidManifest.xml
......@@ -143,7 +145,9 @@ Builds:
- versionName: 4.7.7
versionCode: 107
commit: BS-4.7.7
sudo: apt-get -y install -t jessie-backports maven
sudo:
- apt-get update || apt-get update
- apt-get -y install -t jessie-backports maven
output: android/target/android-$$VERSION$$-aligned.apk
rm:
- core/src/test
......@@ -157,7 +161,9 @@ Builds:
- versionName: 4.7.8
versionCode: 108
commit: BS-4.7.8
sudo: apt-get -y install -t jessie-backports maven
sudo:
- apt-get update || apt-get update
- apt-get -y install -t jessie-backports maven
output: android/target/android-$$VERSION$$-aligned.apk
rm:
- core/src/test
......
......@@ -20,9 +20,9 @@ Builds:
versionCode: 1
commit: 1.16.1
sudo:
- apt update || apt update
- apt install -y g++
- apt install -y -t stretch-backports cmake
- apt-get update || apt-get update
- apt-get install -y g++
- apt-get install -y -t stretch-backports cmake
patch:
- 1.16.1-unsigned-apk.patch
- 1.16.1-qstring-constructor.patch
......@@ -48,9 +48,9 @@ Builds:
versionCode: 2
commit: 1.16.2
sudo:
- apt update || apt update
- apt install -y g++
- apt install -y -t stretch-backports cmake
- apt-get update || apt-get update
- apt-get install -y g++
- apt-get install -y -t stretch-backports cmake
patch:
- 1.16.2-statx.patch
output: build/dist/AusweisApp2-$$VERSION$$-armeabi-v7a.apk
......@@ -77,9 +77,9 @@ Builds:
commit: 1.20.0
timeout: 20000
sudo:
- apt update || apt update
- apt install -y g++
- apt install -y -t stretch-backports cmake
- apt-get update || apt-get update
- apt-get install -y g++
- apt-get install -y -t stretch-backports cmake
patch:
- 1.20.0-fixture.patch
output: build/dist/AusweisApp2-$$VERSION$$-armeabi-v7a.apk
......
......@@ -21,8 +21,8 @@ Builds:
commit: 4552b111043665f5501bcfb0173c0e09bf19447a
timeout: 80000
sudo:
- apt update || apt update
- apt install -y doxygen g++ pkgconf wget
- apt-get update || apt-get update
- apt-get install -y doxygen g++ pkgconf wget
patch:
- build-gradle.patch
- androidmanifest.patch
......
......@@ -38,7 +38,7 @@ Builds:
commit: v3.0.1-Limbox86-multiarch
subdir: limbo-android-x86
sudo:
- apt-get update
- apt-get update || apt-get update
- apt-get install -y libltdl-dev g++-multilib texinfo
gradle:
- yes
......
......@@ -1101,8 +1101,8 @@ Builds:
commit: 0.10.19
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
......@@ -1118,8 +1118,8 @@ Builds:
commit: 1.1.1
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
......@@ -1135,8 +1135,8 @@ Builds:
commit: 1.1.2.1
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
......@@ -1152,8 +1152,8 @@ Builds:
commit: 1.1.4
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
......@@ -1169,8 +1169,8 @@ Builds:
commit: 1.2.0
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
......@@ -1186,8 +1186,8 @@ Builds:
commit: 1.2.1
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
......@@ -1203,8 +1203,8 @@ Builds:
commit: 1.2.2
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
......@@ -1220,8 +1220,8 @@ Builds:
commit: 1.2.2.2
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
......@@ -1237,8 +1237,8 @@ Builds:
commit: 1.2.2.3
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-1.13-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-1.13-go
- ln -s /usr/lib/go-1.13 /usr/lib/go
- ln -s /usr/lib/go-1.13/bin/go /usr/bin/go
gradle:
......@@ -1256,8 +1256,8 @@ Builds:
commit: 1.2.2.4
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-1.13-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-1.13-go
- ln -s /usr/lib/go-1.13 /usr/lib/go
- ln -s /usr/lib/go-1.13/bin/go /usr/bin/go
gradle:
......@@ -1275,8 +1275,8 @@ Builds:
commit: 1.3.0
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-1.13-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-1.13-go
- ln -s /usr/lib/go-1.13 /usr/lib/go
- ln -s /usr/lib/go-1.13/bin/go /usr/bin/go
gradle:
......@@ -1294,8 +1294,8 @@ Builds:
commit: 1.3.1
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-1.13-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-1.13-go
- ln -s /usr/lib/go-1.13 /usr/lib/go
- ln -s /usr/lib/go-1.13/bin/go /usr/bin/go
gradle:
......@@ -1313,8 +1313,8 @@ Builds:
commit: 1.3.2
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
......@@ -1330,8 +1330,8 @@ Builds:
commit: 1.3.3
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
......@@ -1347,8 +1347,8 @@ Builds:
commit: 1.3.4
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
......@@ -1364,8 +1364,8 @@ Builds:
commit: 1.4.0
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
......@@ -1381,8 +1381,8 @@ Builds:
commit: 1.4.2
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
......@@ -1398,8 +1398,8 @@ Builds:
commit: 1.5.0
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
......@@ -1415,8 +1415,8 @@ Builds:
commit: 1.6.0-rc.4
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
......@@ -1432,8 +1432,8 @@ Builds:
commit: 1.6.1
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
......@@ -1449,8 +1449,8 @@ Builds:
commit: 1.7.0
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
......@@ -1466,8 +1466,8 @@ Builds:
commit: 1.7.1
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
......@@ -1483,8 +1483,8 @@ Builds:
commit: 1.8.0
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-go
- apt-get update || apt-get update
- apt-get install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
......
......@@ -100,8 +100,8 @@ Builds:
commit: v10.5e
subdir: hyperroid/app
sudo:
- apt update || apt update
- apt install -y g++
- apt-get update || apt-get update
- apt-get install -y g++
gradle:
- yes
prebuild: sed -i -e "s/abiFilters .*/abiFilters 'x86', 'x86_64', 'armeabi-v7a',
......@@ -118,8 +118,8 @@ Builds:
commit: v11.3l
subdir: hyperroid/app
sudo:
- apt update || apt update
- apt install -y g++
- apt-get update || apt-get update
- apt-get install -y g++
gradle:
- yes
prebuild: sed -i -e "s/abiFilters .*/abiFilters 'x86', 'x86_64', 'armeabi-v7a',
......
......@@ -26,7 +26,9 @@ Builds:
disable: network hard forked
commit: v1.5.10.6
timeout: 14400
sudo: apt install -y g++ build-essential tofrodos
sudo:
- apt-get update || apt-get update
- apt-get install -y g++ build-essential tofrodos
gradle:
- yes
output: app/build/outputs/apk/release/wownerujo-*_universal.apk
......@@ -38,7 +40,7 @@ Builds:
disable: network hard forked
commit: v1.6.3.0
timeout: 14400
sudo: apt install -y g++ build-essential tofrodos
sudo: apt-get install -y g++ build-essential tofrodos
gradle:
- yes
output: app/build/outputs/apk/release/wownerujo-*_universal.apk
......@@ -50,7 +52,7 @@ Builds:
disable: network hard forked
commit: v1.6.4.0
timeout: 14400
sudo: apt install -y g++ build-essential tofrodos
sudo: apt-get install -y g++ build-essential tofrodos