inex/FurryChat
1
0
Fork 0
Code Issues Releases 2 Activity

Merge branch 'soru/release' into 'main'

Browse source 
chore: Version update & olm-CI

See merge request ChristianPauly/fluffychat-flutter!162
This commit is contained in:
Christian Pauly 2020-09-13 08:42:08 +00:00
parent 41701b39dc 0f805a295c
commit 6851b9ab3c
3 changed files with 16 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
.gitlab-ci.yml
View file

@ -28,11 +28,10 @@ build_web:
- sudo apt update - sudo apt update
- sudo apt install curl -y - sudo apt install curl -y
- rm -r assets/js/package - rm -r assets/js/package
# enable olm AFTER we move website out of USA - cd assets/js/ && curl -L 'https://gitlab.com/famedly/libraries/olm/-/jobs/artifacts/master/download?job=build_js' > olm.zip && cd ../../
# - cd assets/js/ && curl -L 'https://gitlab.com/famedly/libraries/olm/-/jobs/artifacts/master/download?job=build_js' > olm.zip && cd ../../ - cd assets/js/ && unzip olm.zip && cd ../../
# - cd assets/js/ && unzip olm.zip && cd ../../ - cd assets/js/ && rm olm.zip && cd ../../
# - cd assets/js/ && rm olm.zip && cd ../../ - cd assets/js/ && mv javascript package && cd ../../
# - cd assets/js/ && mv javascript package && cd ../../
- cd web/ && rm sql-wasm.js sql-wasm.wasm && cd ../ - cd web/ && rm sql-wasm.js sql-wasm.wasm && cd ../
- cd web/ && curl -L 'https://github.com/sql-js/sql.js/releases/latest/download/sqljs-wasm.zip' > sqljs-wasm.zip && cd ../ - cd web/ && curl -L 'https://github.com/sql-js/sql.js/releases/latest/download/sqljs-wasm.zip' > sqljs-wasm.zip && cd ../
- cd web/ && unzip sqljs-wasm.zip && cd ../ - cd web/ && unzip sqljs-wasm.zip && cd ../
@ -41,16 +40,15 @@ build_web:
- flutter pub get - flutter pub get
- flutter pub pub run intl_translation:generate_from_arb --output-dir=lib/l10n --no-use-deferred-loading lib/l10n/l10n.dart lib/l10n/intl_*.arb - flutter pub pub run intl_translation:generate_from_arb --output-dir=lib/l10n --no-use-deferred-loading lib/l10n/l10n.dart lib/l10n/intl_*.arb
- flutter build web --release --verbose - flutter build web --release --verbose
# TODO: upload elsewhere # upload elsewhere, if wanted
artifacts: artifacts:
paths: paths:
- build/web/ - build/web/
build_android_debug_no_olm: build_android_debug:
stage: coverage stage: coverage
script: script:
- sed -i 's/^\s*flutter_olm.*/#&/' pubspec.yaml
- truncate -s $(head -n -2 android/app/build.gradle | wc -c) android/app/build.gradle - truncate -s $(head -n -2 android/app/build.gradle | wc -c) android/app/build.gradle
- flutter build apk --debug -v - flutter build apk --debug -v
artifacts: artifacts:
@ -73,36 +71,12 @@ build_android_apk:
- flutter pub get - flutter pub get
- flutter pub pub run intl_translation:generate_from_arb --output-dir=lib/l10n --no-use-deferred-loading lib/l10n/l10n.dart lib/l10n/intl_*.arb - flutter pub pub run intl_translation:generate_from_arb --output-dir=lib/l10n --no-use-deferred-loading lib/l10n/l10n.dart lib/l10n/intl_*.arb
- flutter build apk --release - flutter build apk --release
- mkdir -p build/with-olm - mkdir -p build/android
- cp build/app/outputs/apk/release/app-release.apk build/with-olm/ - cp build/app/outputs/apk/release/app-release.apk build/android/
artifacts: artifacts:
when: on_success when: on_success
paths: paths:
- build/with-olm/app-release.apk - build/android/app-release.apk
only:
- main
- tags
build_android_apk_no_olm:
stage: coverage
script:
- sed -i 's/^\s*flutter_olm.*/#&/' pubspec.yaml
- cd android && echo $FDROID_KEY | base64 --decode --ignore-garbage > key.jks && cd ..
- cd android && echo "storePassword=${FDROID_KEY_PASS}" >> key.properties && cd ..
- cd android && echo "keyPassword=${FDROID_KEY_PASS}" >> key.properties && cd ..
- cd android && echo "keyAlias=key" >> key.properties && cd ..
- cd android && echo "storeFile=../key.jks" >> key.properties && cd ..
- cd android/app && echo $GOOGLE_SERVICES >> google-services.json && cd ../..
- flutter pub get
- flutter pub pub run intl_translation:generate_from_arb --output-dir=lib/l10n --no-use-deferred-loading lib/l10n/l10n.dart lib/l10n/intl_*.arb
- flutter build apk --release
- mkdir -p build/without-olm
- cp build/app/outputs/apk/release/app-release.apk build/without-olm/
artifacts:
when: on_success
paths:
- build/without-olm/app-release.apk
only: only:
- main - main
- tags - tags
@ -118,36 +92,16 @@ build_android_appbundle:
- cd android && echo "storeFile=../key.jks" >> key.properties && cd .. - cd android && echo "storeFile=../key.jks" >> key.properties && cd ..
- cd android/app && echo $GOOGLE_SERVICES >> google-services.json && cd ../.. - cd android/app && echo $GOOGLE_SERVICES >> google-services.json && cd ../..
- flutter build appbundle --target-platform android-arm,android-arm64,android-x64 - flutter build appbundle --target-platform android-arm,android-arm64,android-x64
- mkdir -p build/with-olm - mkdir -p build/android
- cp build/app/outputs/bundle/release/app-release.aab build/with-olm/ - cp build/app/outputs/bundle/release/app-release.aab build/android/
artifacts: artifacts:
when: on_success when: on_success
paths: paths:
- build/with-olm/app-release.aab - build/android/app-release.aab
only: only:
- main - main
build_android_appbundle_no_olm:
stage: coverage
script:
- sed -i 's/^\s*flutter_olm.*/#&/' pubspec.yaml
- cd android && echo $FDROID_KEY | base64 --decode --ignore-garbage > key.jks && cd ..
- cd android && echo "storePassword=${FDROID_KEY_PASS}" >> key.properties && cd ..
- cd android && echo "keyPassword=${FDROID_KEY_PASS}" >> key.properties && cd ..
- cd android && echo "keyAlias=key" >> key.properties && cd ..
- cd android && echo "storeFile=../key.jks" >> key.properties && cd ..
- cd android/app && echo $GOOGLE_SERVICES >> google-services.json && cd ../..
- flutter build appbundle --target-platform android-arm,android-arm64,android-x64
- mkdir -p build/without-olm
- cp build/app/outputs/bundle/release/app-release.aab build/without-olm/
artifacts:
when: on_success
paths:
- build/without-olm/app-release.aab
only:
- main
upload_to_fdroid_repo: upload_to_fdroid_repo:
stage: publish stage: publish
before_script: before_script:
@ -173,8 +127,8 @@ upload_to_fdroid_repo:
script: script:
- export UPDATE_VERSION=$(pcregrep -o1 'version:\\s([0-9]*\\.[0-9]*\\.[0-9]*)\\+[0-9]*' pubspec.yaml) - export UPDATE_VERSION=$(pcregrep -o1 'version:\\s([0-9]*\\.[0-9]*\\.[0-9]*)\\+[0-9]*' pubspec.yaml)
- mkdir -p upload - mkdir -p upload
- cp build/with-olm/* upload/ - cp build/android/* upload/
- cd build/with-olm/ - cd build/android/
- mv app-release.apk "${UPDATE_VERSION}.apk" - mv app-release.apk "${UPDATE_VERSION}.apk"
- rsync -rav -e ssh ./ fluffy@fdroid.nordgedanken.dev:/fdroid/repo - rsync -rav -e ssh ./ fluffy@fdroid.nordgedanken.dev:/fdroid/repo
- ssh fluffy@fdroid.nordgedanken.dev "cd fdroid && fdroid update" - ssh fluffy@fdroid.nordgedanken.dev "cd fdroid && fdroid update"

2
CHANGELOG.md
View file

@ -1,4 +1,4 @@
# Version 0.18.0 - 2020-09-?? # Version 0.18.0 - 2020-09-13
### Features ### Features
- Added translations: Armenian, Turkish, Chinese (Simplified), Estonian - Added translations: Armenian, Turkish, Chinese (Simplified), Estonian
- Url-ify matrix identifiers - Url-ify matrix identifiers

2
pubspec.yaml
View file

@ -11,7 +11,7 @@ description: Chat with your friends.
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at # Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 0.17.0+44 version: 0.18.0+45
environment: environment:
sdk: ">=2.6.0 <3.0.0" sdk: ">=2.6.0 <3.0.0"