Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
constanline authored Jul 28, 2023
2 parents 0ce75df + 9c10222 commit 5b749a8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 23 deletions.
16 changes: 3 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:

jobs:
build:
permissions: write-all

runs-on: ubuntu-latest

Expand All @@ -25,23 +26,12 @@ jobs:
run: chmod +x gradlew

- name: Build with Gradle
run: ./gradlew assembleRelease

- name: Sign app APK
uses: ilharp/sign-android-release@v1
id: sign_app
with:
releaseDir: app/build/outputs/apk/release/
signingKey: ${{ secrets.ANDROID_SIGNING_KEY }}
keyAlias: ${{ secrets.ANDROID_KEY_ALIAS }}
keyStorePassword: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
keyPassword: ${{ secrets.ANDROID_KEY_PASSWORD }}
buildToolsVersion: 30.0.3
run: ./gradlew assembleDebug

- name: Upload to Release Action
uses: Shopify/[email protected]
with:
name: xqe-sesame-${{ github.event.release.tag_name }}.apk
path: ${{ steps.sign_app.outputs.signedFile }}
path: app/build/outputs/apk/debug/app-debug.apk
repo-token: ${{ github.token }}
content-type: application/zip
10 changes: 0 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,6 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
applicationVariants.configureEach { variant ->
variant.outputs.configureEach { output ->
def outputFile = output.outputFile
if (outputFile != null && outputFile.name.endsWith('.apk')) {
if (variant.buildType.name == 'release') {
outputFileName = "xqe-sesame-v${defaultConfig.versionName}.apk"
}
}
}
}
}

dependencies {
Expand Down

0 comments on commit 5b749a8

Please sign in to comment.