Commit 43eae5b3 authored by Licaon_Kter's avatar Licaon_Kter
Browse files

Merge branch 'master' into 'master'

fix se.manyver versionName (drop redundant suffix)

See merge request !7531
parents d7062084 9d0d2763
Pipeline #199997794 passed with stages
in 9 minutes and 28 seconds
......@@ -1452,56 +1452,9 @@ Builds:
- npm run build-android-assets
ndk: r21b
- versionName: 0.2009.28-beta-fdroid
versionCode: 91
commit: v0.2009.28-beta
timeout: 30000
subdir: android/app
sudo:
- apt-get update || apt-get update
- apt-get install -y --no-install-recommends g++ lib32stdc++-6-dev libc6-dev-i386
ninja-build linux-libc-dev linux-libc-dev:i386
- curl -Lo node.tar.xz https://nodejs.org/dist/v12.16.3/node-v12.16.3-linux-x64.tar.xz
- echo "1956e196e3c3c8ef5f0c45db76d7c1245af4ccdda2b7ab30a57ce91d6e165caa node.tar.xz"
| sha256sum -c -
- tar xJf node.tar.xz
- cp -a node-v12.16.3-linux-x64/. /usr/local/
- npm install -g react-native-cli
init:
- npm install --no-optional
- truncate -s 0 ../../node_modules/react-native/node_modules/@react-native-community/cli/build/commands/server/external/xsel
patch:
- build.patch
gradle:
- fdroid
srclibs:
- NodejsMobile@nodejs-mobile-v0.3.1
rm:
- node_modules/react-native/ReactAndroid/src/main/third-party/java/buck-android-support/buck-android-support.jar
- node_modules/react-native/template/
- e2e/apple-app-store-demo
prebuild: sed -i -e '/lifecycle/d' ../build.gradle
scanignore:
- android/build.gradle
- node_modules/@react-native-community/async-storage/android/build.gradle
- node_modules/react-native-localize/android/build.gradle
- node_modules/react-native/android
- node_modules/jsc-android
scandelete:
- node_modules
build:
- pushd $$NodejsMobile$$
- ./tools/android_build.sh $$NDK$$ arm
- ./tools/android_build.sh $$NDK$$ arm64
- popd
- mv $$NodejsMobile$$/out_android/armeabi-v7a/libnode.so ../../node_modules/nodejs-mobile-react-native/android/libnode/bin/armeabi-v7a/libnode.so
- mv $$NodejsMobile$$/out_android/arm64-v8a/libnode.so ../../node_modules/nodejs-mobile-react-native/android/libnode/bin/arm64-v8a/libnode.so
- npm run build-android-assets
ndk: r21d
- versionName: 0.2010.5-beta-fdroid-fdroid
- versionName: 0.2010.5-beta-fdroid
versionCode: 92
commit: v0.2010.5-beta-fdroid
commit: v0.2010.5-beta
timeout: 30000
subdir: android/app
sudo:
......@@ -1552,5 +1505,5 @@ MaintainerNotes: scanignore is used to allow the "node_modules/react-native/andr
AutoUpdateMode: Version +-fdroid v%v
UpdateCheckMode: Tags
CurrentVersion: 0.2010.5-beta-fdroid
CurrentVersion: 0.2010.5-beta
CurrentVersionCode: 92
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment