Merge pull request #385 from zod/workflow-fixes

Fix GitHub workflows

.github/workflows/gradle-publish-test.yml

@@ -1,47 +0,0 @@
-# This workflow will build a package using Gradle, no releasee 
-
-name: Gradle Package Test
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    environment: BRouter
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
-      with:
-        java-version: '11'
-        distribution: 'zulu'
-        cache: gradle
-    - name: Create local.properties
-      run: touch local.properties
-    - name: Setup keystore
-      env:
-        BROUTER_KEYSTORE_BASE64: ${{ secrets.BROUTER_KEYSTORE_BASE64 }}
-      run: |
-        echo $BROUTER_KEYSTORE_BASE64 | base64 -di > ${{ github.workspace }}/brouter.jks
-    - name: Build with Gradle
-      env:
-        ORG_GRADLE_PROJECT_RELEASE_STORE_FILE: ${{ secrets.BROUTER_KEYSTORE_FILE }}
-        ORG_GRADLE_PROJECT_RELEASE_KEY_ALIAS: ${{ secrets.BROUTER_KEY_ALIAS }}
-        ORG_GRADLE_PROJECT_RELEASE_KEY_PASSWORD: ${{ secrets.BROUTER_KEY_PASSWORD }}
-        ORG_GRADLE_PROJECT_RELEASE_STORE_PASSWORD: ${{ secrets.BROUTER_STORE_PASSWORD }} 
-      run: ./gradlew clean build
-    - name: Upload BRouter zip
-      uses: actions/upload-artifact@v2
-      with:
-        name: BRouter_current
-        path: brouter-server/build/distributions/brouter-*.zip
-    # The USERNAME and TOKEN need to correspond to the credentials environment variables used in
-    # the publishing section of your build.gradle
-    #- name: Publish to GitHub Packages
-    #  run: gradle publish
-    #  env:
-    #    USERNAME: ${{ github.actor }}
-    #    TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    #    REPO: ${{ github.repository }}

.github/workflows/gradle-publish.yml

@@ -39,10 +39,8 @@ jobs:
         ORG_GRADLE_PROJECT_RELEASE_KEY_ALIAS: ${{ secrets.BROUTER_KEY_ALIAS }}
         ORG_GRADLE_PROJECT_RELEASE_KEY_PASSWORD: ${{ secrets.BROUTER_KEY_PASSWORD }}
         ORG_GRADLE_PROJECT_RELEASE_STORE_PASSWORD: ${{ secrets.BROUTER_STORE_PASSWORD }} 
-    - name: Build with Gradle
       run: gradle build
 
-
     # The USERNAME and TOKEN need to correspond to the credentials environment variables used in
     # the publishing section of your build.gradle
     - name: Publish to GitHub Packages

brouter-routing-app/build.gradle

@@ -23,7 +23,7 @@ android {
 
     sourceSets.main.assets.srcDirs += new File(project.buildDir, 'assets')
 
-    if(project.hasProperty("RELEASE_STORE_FILE")) {
+    if(project.hasProperty("RELEASE_STORE_FILE") && RELEASE_STORE_FILE.length() > 0) {
         signingConfigs {
             // this uses a file  ~/.gradle/gradle.properties
             // with content:
@@ -51,7 +51,7 @@ android {
         release {
             minifyEnabled false
             debuggable false
-            if(project.hasProperty("RELEASE_STORE_FILE")) {
+            if(project.hasProperty("RELEASE_STORE_FILE") && RELEASE_STORE_FILE.length() > 0) {
                 signingConfig signingConfigs.release
             }
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'