Fix 1712 (#1715)
* different behaviour for push vs. pr * wrong operator * add debug build type * change artifact file * wrong syntax * picky quotes
This commit is contained in:
parent
a0fbd8a81e
commit
d7fbededa2
|
@ -21,17 +21,31 @@ jobs:
|
||||||
env:
|
env:
|
||||||
RUSEFI_ANDROID_KEYPASS: ${{ secrets.RUSEFI_ANDROID_KEYPASS }}
|
RUSEFI_ANDROID_KEYPASS: ${{ secrets.RUSEFI_ANDROID_KEYPASS }}
|
||||||
working-directory: ./android
|
working-directory: ./android
|
||||||
run: bash ./gradlew build
|
run: |
|
||||||
|
if [ "${{github.event_name}}" == "push" ]; then
|
||||||
|
bash ./gradlew build
|
||||||
|
else
|
||||||
|
bash ./gradlew bundleDebug
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Upload APK
|
- name: Upload APK - release
|
||||||
|
if: ${{ github.event_name == 'push' }}
|
||||||
|
uses: actions/upload-artifact@v2
|
||||||
|
with:
|
||||||
|
name: rusEFI-release
|
||||||
|
path: ./android/app/build/outputs/apk/release/rusEFI-release.apk
|
||||||
|
|
||||||
|
- name: Upload APK - unsigned
|
||||||
|
if: ${{ github.event_name != 'push' }}
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v2
|
||||||
with:
|
with:
|
||||||
name: rusEFI-release-unsigned
|
name: rusEFI-release-unsigned
|
||||||
path: ./android/app/build/outputs/apk/release/rusEFI-release.apk
|
path: ./android/app/build/outputs/bundle/debug/rusEFI-debug.aab
|
||||||
|
|
||||||
- name: Install Tools
|
- name: Install Tools
|
||||||
run: sudo apt-get install ncftp
|
run: sudo apt-get install ncftp
|
||||||
|
|
||||||
- name: Upload rusEFI Android application
|
- name: Upload rusEFI Android application
|
||||||
|
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
|
||||||
working-directory: .
|
working-directory: .
|
||||||
run: java_console/upload_server.sh ${{ secrets.RUSEFI_BUILD_FTP_USER }} ${{ secrets.RUSEFI_BUILD_FTP_PASS }} ${{ secrets.RUSEFI_FTP_SERVER }} . android/app/build/outputs/apk/release/rusEFI-release.apk
|
run: java_console/upload_server.sh ${{ secrets.RUSEFI_BUILD_FTP_USER }} ${{ secrets.RUSEFI_BUILD_FTP_PASS }} ${{ secrets.RUSEFI_FTP_SERVER }} . android/app/build/outputs/apk/release/rusEFI-release.apk
|
||||||
|
|
|
@ -36,6 +36,9 @@ android {
|
||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
debug {
|
||||||
|
minifyEnabled false
|
||||||
|
}
|
||||||
release {
|
release {
|
||||||
minifyEnabled false
|
minifyEnabled false
|
||||||
signingConfig signingConfigs.release
|
signingConfig signingConfigs.release
|
||||||
|
|
Loading…
Reference in New Issue