From 82d28ed08ac7d8d39e1499c2d61abfaf2580e4b0 Mon Sep 17 00:00:00 2001 From: Manuel Fuhr Date: Fri, 31 Dec 2021 08:30:37 +0100 Subject: [PATCH 1/3] Fix build with empty signing environment variables GitHub action secrets default to empty values if they aren't defined in a repository. Any fork of the repo doesn't have access to the secrets and the jobs therefore fail. --- brouter-routing-app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/brouter-routing-app/build.gradle b/brouter-routing-app/build.gradle index 58dde91..9ddfdb3 100644 --- a/brouter-routing-app/build.gradle +++ b/brouter-routing-app/build.gradle @@ -21,7 +21,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: @@ -49,7 +49,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' From b5f6acf63afefcbf038534b2e5b4bfeffbc94cc4 Mon Sep 17 00:00:00 2001 From: Manuel Fuhr Date: Fri, 31 Dec 2021 08:33:43 +0100 Subject: [PATCH 2/3] Fix gradle-publish --- .github/workflows/gradle-publish.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml index 960762b..0dab983 100644 --- a/.github/workflows/gradle-publish.yml +++ b/.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 From 395586cdda731f1a73f80d240e48796570975480 Mon Sep 17 00:00:00 2001 From: Manuel Fuhr Date: Fri, 7 Jan 2022 13:17:41 +0100 Subject: [PATCH 3/3] Delete test workflow --- .github/workflows/gradle-publish-test.yml | 47 ----------------------- 1 file changed, 47 deletions(-) delete mode 100644 .github/workflows/gradle-publish-test.yml diff --git a/.github/workflows/gradle-publish-test.yml b/.github/workflows/gradle-publish-test.yml deleted file mode 100644 index fd0b626..0000000 --- a/.github/workflows/gradle-publish-test.yml +++ /dev/null @@ -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 }}