fix CI build

Author: nullkiller

.github/CI/vcmiconf.json.in

@@ -8,7 +8,7 @@
 	"ndkRoot" : "$NDK_ROOT",
 	"sdkRoot" : "$SDK_ROOT",
 	"javaRoot": "$JAVA_HOME",
-    "abis" : "arm64-v8a x86 x86_64 armeabi-v7a",
+    "abis" : "arm64-v8a armeabi-v7a",
 	"boostFolderName" : "boost_1_68_0",
 	"androidApi" : 21,
 	"cmakeBuildMode" : "Release"

.github/workflows/github.yml

@@ -21,6 +21,7 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: recursive
+        fetch-depth: 0
 
     - name: Update VCMI Sources
       run: |
@@ -47,14 +48,15 @@ jobs:
         chmod +x ./project/gradlew
         python ./.github/CI/create_conf.py
         python ./update_internal_assets.py
+        python ./build.py fixpaths
         cd ./project
-        ./gradlew vcmi-app:assembleVcmiOnlyRelease --info
+        ./gradlew vcmi-app:assembleAllTargetsRelease --info
         
     - name: Artifacts
       uses: actions/upload-artifact@v2
       with:
         name: vcmi.apk
-        path: ${{github.workspace}}/project/vcmi-app/build/outputs/apk/VcmiOnly/release/vcmi-app-debug.apk
+        path: ${{github.workspace}}/project/vcmi-app/build/outputs/apk/AllTargets/release/vcmi-app-release.apk
 
 #    - name: Upload build
 #      run: |
@@ -64,10 +66,10 @@ jobs:
 #        DEPLOY_RSA: ${{ secrets.DEPLOY_RSA }}
 #        PACKAGE_EXTENSION: apk
 #        
-#    - uses: act10ns/slack@v1
-#      with:
-#        status: ${{ job.status }}
-#        channel: '#notifications'
-#      env:
-#        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-#      if: always()
+    - uses: act10ns/slack@v1
+      with:
+        status: ${{ job.status }}
+        channel: '#notifications'
+      env:
+        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+      if: always()

project/vcmi-app/build.gradle

@@ -6,7 +6,7 @@ android {
 	compileSdk 31
 
 	defaultConfig {
-		applicationId "eu.vcmi.vcmi"
+		applicationId "is.xyz.vcmi"
 		minSdk 21
 		targetSdk 31
 		versionCode 1
@@ -26,10 +26,17 @@ android {
 			abiFilters.addAll(VCMI_ABIS)
 		}
 	}
+	
+	signingConfigs {
+        releaseSigning
+        LoadSigningConfig(PROJECT_PATH_BASE)
+    }
 
 	buildTypes {
 		release {
 			minifyEnabled false
+			zipAlignEnabled true
+			signingConfig signingConfigs.releaseSigning
 			proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
 		}
 	}
@@ -101,6 +108,86 @@ android {
 	}
 }
 
+def RenameOutput(final baseName, final variant) {
+    final def apkPath = variant.outputs[0].outputFile.parent
+    final def travisId = System.getenv("TRAVIS_JOB_ID")
+    ResolveGitInfo()
+    def name = baseName + "-" + ext.gitInfoLauncher + "-" + ext.gitInfoVcmi
+
+    if (travisId != null && !travisId.isEmpty()) {
+        name = travisId + "-" + name
+    }
+
+    if (!variant.buildType.name != "release") {
+        name += "-" + variant.buildType.name
+    }
+
+    variant.outputs*.outputFile = new File(apkPath, name + ".apk")
+}
+
+def CommandOutput(final cmd, final arguments, final cwd) {
+    try {
+        new ByteArrayOutputStream().withStream { final os ->
+            exec {
+                executable cmd
+                args arguments
+                workingDir cwd
+                standardOutput os
+            }
+            return os.toString().trim()
+        }
+    }
+    catch (final Exception ex) {
+        print("Broken: " + cmd + " " + arguments + " in " + cwd + " :: " + ex.toString())
+        return ""
+    }
+}
+
+def ResolveGitInfo() {
+    if (ext.gitInfoLauncher != "none" && ext.gitInfoVcmi != "none") {
+        return
+    }
+    ext.gitInfoLauncher = CommandOutput("git", ["describe", "--match=", "--always", "--abbrev=7"], PROJECT_PATH_BASE)
+    ext.gitInfoVcmi =
+            CommandOutput("git", ["rev-parse", "--abbrev-ref", "HEAD"], PROJECT_PATH_BASE + "/ext/vcmi").replaceAll("[^a-zA-Z0-9\\-_]", "_") +
+                    "-" +
+                    CommandOutput("git", ["describe", "--match=", "--always", "--abbrev=7"], PROJECT_PATH_BASE + "/ext/vcmi")
+}
+
+def SigningPropertiesPath(final basePath) {
+    return file(basePath + "/.github/CI/signing.properties")
+}
+
+def SigningKeystorePath(final basePath, final keystoreFileName) {
+    return file(basePath + "/.github/CI/" + keystoreFileName)
+}
+
+def LoadSigningConfig(final basePath) {
+    final def props = new Properties()
+    final def propFile = SigningPropertiesPath(basePath)
+    if (propFile.canRead()) {
+        props.load(new FileInputStream(propFile))
+
+        if (props != null
+                && props.containsKey('STORE_FILE')
+                && props.containsKey('STORE_PASSWORD')
+                && props.containsKey('KEY_ALIAS')
+                && props.containsKey('KEY_PASSWORD')) {
+
+            android.signingConfigs.releaseSigning.storeFile = SigningKeystorePath(basePath, props['STORE_FILE'])
+            android.signingConfigs.releaseSigning.storePassword = props['STORE_PASSWORD']
+            android.signingConfigs.releaseSigning.keyAlias = props['KEY_ALIAS']
+            android.signingConfigs.releaseSigning.keyPassword = props['KEY_PASSWORD']
+        } else {
+            println("Some props from signing file are missing")
+            android.buildTypes.release.signingConfig = null
+        }
+    } else {
+        println("file with signing properties is missing")
+        android.buildTypes.release.signingConfig = null
+    }
+}
+
 dependencies {
 	implementation 'androidx.appcompat:appcompat:1.2.0'
 	implementation 'com.google.android.material:material:1.3.0'

vcmiconf.py

@@ -8,8 +8,7 @@ def updateProjectProps():
 
 def createLocalProps():
 	vcmiutil.rewriteFile("./project/local.properties", 
-		"sdk.dir=" + config["sdkRoot"].replace(":", "\\:") 
-		+ "\nndk.dir=" + config["ndkRoot"].replace(":", "\\:"))
+		"sdk.dir=" + config["sdkRoot"].replace(":", "\\:"))
 
 config = []
 with open("./vcmiconf.json", "r") as confFile: