zaneschepke
/
wgtunnel
mirror of https://github.com/zaneschepke/wgtunnel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change: build pipeline to fastlane deploy

This commit is contained in:
Zane Schepke 2023-11-09 01:50:53 -05:00
parent eb7b39c379
commit 90b006acc5
11 changed files with 87 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
.github/workflows/android.yml vendored
View File

@ -9,8 +9,15 @@ on:
jobs:
build:
name: Build Signed APK
# change to macos because of hilt issues on ubuntu in gradle 8.3
runs-on: ubuntu-latest
env:
KEY_STORE_PATH: ${{ secrets.KEY_STORE_PATH }}
SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
@ -29,72 +36,55 @@ jobs:
uses: timheuer/base64-to-file@v1.2
with:
fileName: 'android_keystore.jks'
fileDir: '/home/runner/work/wgtunnel/wgtunnel/app/keystore/'
fileDir: ${{ github.workspace }}/app/keystore/
encodedString: ${{ secrets.KEYSTORE }}
- name: Create service_account.json
id: createServiceAccount
run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
# Build and sign APK ("-x test" argument is used to skip tests)
# add fdroid flavor for apk upload
- name: Build Fdroid Release APK
run: ./gradlew :app:assembleFdroidRelease -x test
env:
KEY_STORE_PATH: ${{ secrets.KEY_STORE_PATH }}
SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
# get fdroid flavor release apk path
- name: Get apk path
id: apk-path
run: echo "path=$(find . -regex '^.*/build/outputs/apk/fdroid/release/.*\.apk$' -type f | head -1)" >> $GITHUB_OUTPUT
# add general flavor for google play
- name: Build General Release AAB
id: buildRelease
run: ./gradlew bundleGeneralRelease
env:
KEY_STORE_PATH: ${{ secrets.KEY_STORE_PATH }}
SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
# Save the APK after the Build job is complete to publish it as a Github release in the next job
- name: Upload APK
uses: actions/upload-artifact@v3.1.2
with:
name: wgtunnel
path: ${{ steps.apk-path.outputs.path }}
- name: Create service_account.json
id: createServiceAccount
run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
# upload general flavor release aab to beta track
- name: Publish to Play Store BETA
id: publish
uses: r0adkll/upload-google-play@v1.1.2
with:
serviceAccountJson: service_account.json
packageName: com.zaneschepke.wireguardautotunnel
releaseFiles: app/build/outputs/bundle/generalRelease/app-general-release.aab
track: beta
release:
name: Release APK
needs: build
runs-on: ubuntu-latest
steps:
- name: Download APK from build
uses: actions/download-artifact@v1
with:
name: wgtunnel
- name: Create Release
- name: Create Release with Fastlane changelog notes
id: create_release
uses: softprops/action-gh-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
# fix hardcode changelog file name
body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/32100.txt
tag_name: ${{ github.ref_name }}
name: Release ${{ github.ref_name }}
draft: false
prerelease: false
files: wgtunnel/${{ steps.apk-path.outputs.path }}
files: ${{ github.workspace }}/${{ steps.apk-path.outputs.path }}
deploy:
name: Deploy with fastlane
needs: build
runs-on: ubuntu-latest
steps:
- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.2' # Not needed with a .ruby-version file
bundler-cache: true
- name: Distribute app to Beta track 🚀
run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane beta)

3
Gemfile Normal file
View File

@ -0,0 +1,3 @@
source "https://rubygems.org"
gem "fastlane"

34
app/build.gradle.kts
View File

@ -9,15 +9,15 @@ plugins {
}
android {
namespace = "com.zaneschepke.wireguardautotunnel"
compileSdk = 34
namespace = Constants.APP_ID
compileSdk = Constants.TARGET_SDK
defaultConfig {
applicationId = "com.zaneschepke.wireguardautotunnel"
minSdk = 26
targetSdk = 34
versionCode = 32000
versionName = "3.2.1"
applicationId = Constants.APP_ID
minSdk = Constants.MIN_SDK
targetSdk = Constants.TARGET_SDK
versionCode = Constants.VERSION_CODE
versionName = Constants.VERSION_NAME
ksp {
arg("room.schemaLocation", "$projectDir/schemas")
@ -41,16 +41,12 @@ android {
load(file("signing_template.properties").reader())
}
}
val storePassVarName = "SIGNING_STORE_PASSWORD"
val keyAliasVarName = "SIGNING_KEY_ALIAS"
val keyPassVarName = "SIGNING_KEY_PASSWORD"
val keyStorePathVarName = "KEY_STORE_PATH"
//try to get secrets from env first for pipeline build, then properties file for local build
storeFile = file(System.getenv().getOrDefault(keyStorePathVarName, properties.getProperty(keyStorePathVarName)))
storePassword = System.getenv().getOrDefault(storePassVarName, properties.getProperty(storePassVarName))
keyAlias = System.getenv().getOrDefault(keyAliasVarName, properties.getProperty(keyAliasVarName))
keyPassword = System.getenv().getOrDefault(keyPassVarName, properties.getProperty(keyPassVarName))
storeFile = file(System.getenv().getOrDefault(Constants.KEY_STORE_PATH_VAR, properties.getProperty(Constants.KEY_STORE_PATH_VAR)))
storePassword = System.getenv().getOrDefault(Constants.STORE_PASS_VAR, properties.getProperty(Constants.STORE_PASS_VAR))
keyAlias = System.getenv().getOrDefault(Constants.KEY_ALIAS_VAR, properties.getProperty(Constants.KEY_ALIAS_VAR))
keyPassword = System.getenv().getOrDefault(Constants.KEY_PASS_VAR, properties.getProperty(Constants.KEY_PASS_VAR))
}
}
@ -119,6 +115,14 @@ android {
}
}
tasks.register("printVersionCode") {
doLast {
//print version code for CI
println(Constants.VERSION_CODE)
}
}
val generalImplementation by configurations
dependencies {
implementation(libs.androidx.core.ktx)

2
app/signing_template.properties
View File

@ -1,4 +1,4 @@
SIGNING_STORE_PASSWORD=
SIGNING_KEY_ALIAS=
SIGNING_KEY_PASSWORD=
KEY_STORE_PATH=
KEY_STORE_PATH=/

2
build.gradle.kts
View File

@ -7,8 +7,6 @@ buildscript {
}
}
plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.android) apply false

12
buildSrc/src/main/kotlin/Constants.kt Normal file
View File

@ -0,0 +1,12 @@
object Constants {
const val VERSION_NAME = "3.2.1"
const val VERSION_CODE = 32100
const val TARGET_SDK = 34
const val MIN_SDK = 26
const val APP_ID = "com.zaneschepke.wireguardautotunnel"
const val STORE_PASS_VAR = "SIGNING_STORE_PASSWORD"
const val KEY_ALIAS_VAR = "SIGNING_KEY_ALIAS"
const val KEY_PASS_VAR = "SIGNING_KEY_PASSWORD"
const val KEY_STORE_PATH_VAR = "KEY_STORE_PATH"
}

2
fastlane/Appfile Normal file
View File

@ -0,0 +1,2 @@
json_key_file "service_account.json"
package_name "com.zaneschepke.wireguardautotunnel"

17
fastlane/Fastfile Normal file
View File

@ -0,0 +1,17 @@
default_platform(:android)
platform :android do
desc "Deploy a beta version to the Google Play"
lane :beta do
gradle(task: "clean bundleGeneralRelease")
upload_to_play_store(track: 'beta')
end
desc "Deploy a new version to the Google Play"
lane :production do
gradle(task: "clean bundleGeneralRelease")
upload_to_play_store
end
end

3
fastlane/metadata/android/en-US/changelogs/32100.txt Normal file
View File

@ -0,0 +1,3 @@
Enhancements:
- Fix < Android 9 permission bug
- Other optimizations

2
gradle/libs.versions.toml
View File

@ -21,7 +21,7 @@ navigationCompose = "2.7.5"
roomVersion = "2.6.0"
timber = "5.0.1"
tunnel = "1.0.20230706"
androidGradlePlugin = "8.3.0-alpha06"
androidGradlePlugin = "8.2.0-rc03"
kotlin="1.9.10"
ksp="1.9.10-1.0.13"
composeBom="2023.10.01"

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Wed Oct 11 22:39:21 EDT 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists