Misc fixes after build

This commit is contained in:
Jochen Sprickerhof 2021-04-07 08:48:18 +02:00
parent 26be4b8bd4
commit 1df70f8754
12 changed files with 14 additions and 63 deletions

View file

@ -100,6 +100,7 @@ Builds:
- versionName: 0.5.1 - versionName: 0.5.1
versionCode: 24 versionCode: 24
disable: g++ Command not found https://gitlab.com/fdroid/fdroiddata/-/merge_requests/8691
commit: v0.5.1 commit: v0.5.1
subdir: android/app subdir: android/app
sudo: sudo:

View file

@ -361,30 +361,6 @@ Builds:
- tr -d '\r' < gradle-wrapper.properties_orig >gradle-wrapper.properties - tr -d '\r' < gradle-wrapper.properties_orig >gradle-wrapper.properties
- popd - popd
- versionName: 1.0.92
versionCode: 10920
commit: 1.0.92
subdir: app
gradle:
- yes
prebuild:
- pushd ../gradle/wrapper
- mv gradle-wrapper.properties gradle-wrapper.properties_orig
- tr -d '\r' < gradle-wrapper.properties_orig >gradle-wrapper.properties
- popd
- versionName: 1.0.92
versionCode: 10922
commit: 1.0.92
subdir: app
gradle:
- yes
prebuild:
- pushd ../gradle/wrapper
- mv gradle-wrapper.properties gradle-wrapper.properties_orig
- tr -d '\r' < gradle-wrapper.properties_orig >gradle-wrapper.properties
- popd
- versionName: 1.0.92 - versionName: 1.0.92
versionCode: 10923 versionCode: 10923
commit: 1.0.92 commit: 1.0.92

View file

@ -547,8 +547,6 @@ Builds:
sudo: sudo:
- apt-get update || apt-get update - apt-get update || apt-get update
- apt-get install -y --no-install-recommends libgmp-dev - apt-get install -y --no-install-recommends libgmp-dev
patch:
- openvpn-build.patch
gradle: gradle:
- prod - prod
output: build/outputs/apk/prod/release/ProtonVPN-*-prod-release-unsigned.apk output: build/outputs/apk/prod/release/ProtonVPN-*-prod-release-unsigned.apk
@ -560,9 +558,12 @@ Builds:
- openvpn/src/main/cpp/mbedtls/tests - openvpn/src/main/cpp/mbedtls/tests
- openvpn/src/main/cpp/openvpn3/test/unittests - openvpn/src/main/cpp/openvpn3/test/unittests
- strongswan/testing/hosts/alice/etc/raddb/certs/random - strongswan/testing/hosts/alice/etc/raddb/certs/random
- openvpn/src/main/cpp/mbedtls/programs/fuzz/corpuses/*
prebuild: prebuild:
- sed -i -e '/triple/d' -e '/play\ {/,+4d' build.gradle - sed -i -e '/triple/d' -e '/play\ {/,+4d' build.gradle
- sed -i -e '/kotlinx/d' ../build.gradle - sed -i -e '/kotlinx/d' ../build.gradle
- sed -i -e 's/21.3.6528147/21.4.7075529/' ../openvpn/build.gradle.kts
- sed -i -e 's/21.3.6528147/21.4.7075529/' build.gradle
- pushd ../strongswan - pushd ../strongswan
- git clone git://git.strongswan.org/android-ndk-boringssl.git -b ndk-static - git clone git://git.strongswan.org/android-ndk-boringssl.git -b ndk-static
src/frontends/android/app/src/main/jni/openssl src/frontends/android/app/src/main/jni/openssl
@ -587,7 +588,7 @@ Builds:
- rm -fr openvpn/build/tmp - rm -fr openvpn/build/tmp
- rm -fr openvpn/.cxx - rm -fr openvpn/.cxx
- popd - popd
ndk: r21d ndk: r21e
gradleprops: gradleprops:
- buildUniversalApk - buildUniversalApk

View file

@ -1928,6 +1928,7 @@ Builds:
- versionName: 3.5.5 - versionName: 3.5.5
versionCode: 355 versionCode: 355
disable: fails to build https://github.com/Blockstream/green_android/issues/114
commit: release_3.5.5 commit: release_3.5.5
timeout: 25200 timeout: 25200
subdir: app subdir: app

View file

@ -41,6 +41,7 @@ Builds:
- versionName: 5.0.45 - versionName: 5.0.45
versionCode: 45 versionCode: 45
disable: no git tag
commit: v5.0.45 commit: v5.0.45
output: build/app/outputs/flutter-apk/app-release.apk output: build/app/outputs/flutter-apk/app-release.apk
srclibs: srclibs:

View file

@ -68,7 +68,7 @@ Builds:
commit: v1.0.10 commit: v1.0.10
output: build/app/outputs/apk/release/app-release.apk output: build/app/outputs/apk/release/app-release.apk
srclibs: srclibs:
- flutter@1.22.5 - flutter@2.0.3
prebuild: echo 'android.applicationVariants.all { variant -> variant.outputs.all prebuild: echo 'android.applicationVariants.all { variant -> variant.outputs.all
{ output -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle { output -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle
build: build:

View file

@ -76,13 +76,6 @@ Builds:
gradle: gradle:
- yes - yes
- versionName: 2.3.0
versionCode: 230
commit: v2.3.0
subdir: app
gradle:
- yes
- versionName: 2.3.2 - versionName: 2.3.2
versionCode: 232 versionCode: 232
commit: v2.3.2 commit: v2.3.2

View file

@ -442,6 +442,7 @@ Builds:
- versionName: 10.0.2 - versionName: 10.0.2
versionCode: 1000021 versionCode: 1000021
disable: contains binaries https://github.com/lucasnlm/antimine-android/issues/261
commit: 10.0.2 commit: 10.0.2
subdir: app subdir: app
gradle: gradle:

View file

@ -32,6 +32,10 @@ Builds:
versionCode: 42 versionCode: 42
commit: 2.4.0 commit: 2.4.0
subdir: app subdir: app
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk
- update-alternatives --auto java
gradle: gradle:
- yes - yes

View file

@ -594,6 +594,7 @@ Builds:
subdir: app subdir: app
gradle: gradle:
- yes - yes
prebuild: sed -i -e 's/22.1.7171670/22.0.7026061/' build.gradle
scanignore: scanignore:
- Resources/symlink_hosts_to_data.zip - Resources/symlink_hosts_to_data.zip
ndk: r22 ndk: r22

View file

@ -28,13 +28,6 @@ Builds:
gradle: gradle:
- yes - yes
- versionName: '1.10'
versionCode: 110
commit: V1.10
subdir: app
gradle:
- yes
AutoUpdateMode: Version V%v AutoUpdateMode: Version V%v
UpdateCheckMode: Tags UpdateCheckMode: Tags
CurrentVersion: '1.04' CurrentVersion: '1.04'

View file

@ -306,27 +306,6 @@ Builds:
build: make TARGET=ANDROID7NEON DEBUG=n TESTING=n -j`nproc` build: make TARGET=ANDROID7NEON DEBUG=n TESTING=n -j`nproc`
ndk: r15c ndk: r15c
- versionName: '7.2'
versionCode: 123
commit: v7.2
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install -y g++ vorbis-tools librsvg2-bin imagemagick
output: output/ANDROID7NEON/opt/build/unsigned.apk
rm:
- android/ioio/release/*.zip
- android/ioio/release/apps/*.zip
- android/ioio/release/software/*.zip
- android/ioio/release/firmware/device-bootloader/*.zip
- android/ioio/release/firmware/bootloader/*.zip
- android/ioio/software/IOIODude/lib
- android/ioio/software/IOIOLib/target/pc/lib
- android/ioio/software/applications/IOIOConnectionTester/lib
- android/ioio/software/applications/pc/jar-in-jar-loader.zip
build: make TARGET=ANDROID7NEON DEBUG=n TESTING=n -j`nproc`
ndk: r15c
- versionName: '7.3' - versionName: '7.3'
versionCode: 124 versionCode: 124
commit: v7.3 commit: v7.3