diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5d5865d98ca2d..e7f256ffd90da 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,7 @@ name: "Experimental Release" concurrency: release on: + workflow_dispatch: push: branches: - master @@ -361,10 +362,8 @@ jobs: if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none' working-directory: ./android run: | - echo "${{ secrets.KEYSTORE }}" > release.keystore.asc - gpg -d --passphrase "${{ secrets.KEYSTORE_PASSWORD }}" --batch release.keystore.asc > app/release.keystore - echo "${{ secrets.KEYSTORE_PROPERTIES }}" > keystore.properties.asc - gpg -d --passphrase "${{ secrets.KEYSTORE_PASSWORD }}" --batch keystore.properties.asc > keystore.properties + keytool -genkey -keystore /tmp/a.keystore -keyalg RSA -keysize 2048 -validity 10000 -alias a -dname "cn=a, ou=a, o=a, c=a" -storepass 123456 -keypass 123456 + echo -e "keyPassword=123456\nkeyAlias=a\nstorePassword=123456\nstoreFile=/tmp/a.keystore" > keystore.properties export UPSTREAM_BUILD_NUMBER="$((11581 + ${{ github.run_number }}))" chmod +x gradlew if [ ${{ matrix.android }} = arm64 ] diff --git a/android/app/build.gradle b/android/app/build.gradle index 437f983e94243..ad0a20a877b5d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -309,7 +309,6 @@ android { } signingConfigs { - if (keystoreProperties.getProperty('storeFile') != null) { if (file(keystoreProperties.getProperty('storeFile')).exists()) { release { storeFile file(keystoreProperties.getProperty("storeFile")) @@ -320,7 +319,6 @@ android { } else { throw new GradleException("Keystore file " + keystoreProperties.getProperty("storeFile") + " was not found.\n") } - } if (keystoreProperties.getProperty('debug_storeFile') != null) { if (file(keystoreProperties.getProperty('debug_storeFile')).exists()) { debug { diff --git a/src/sdltiles.cpp b/src/sdltiles.cpp index 62acd2f7df7b0..c5d398b1e8fc3 100644 --- a/src/sdltiles.cpp +++ b/src/sdltiles.cpp @@ -269,6 +269,10 @@ static void WinCreate() // Without this, the game only displays in the top-left 1/4 of the window. window_flags &= ~SDL_WINDOW_ALLOW_HIGHDPI; #endif +#if defined(__ANDROID__) + // Without this, the game only displays in the top-left 1/4 of the window. + window_flags = SDL_WINDOW_ALLOW_HIGHDPI | SDL_WINDOW_MAXIMIZED; +#endif int display = std::stoi( get_option( "DISPLAY" ) ); if( display < 0 || display >= SDL_GetNumVideoDisplays() ) {