Skip to content

Commit f4bf26b

Browse files
author
Simon Schubert
committed
Fix action paths
1 parent c414265 commit f4bf26b

2 files changed

Lines changed: 16 additions & 37 deletions

File tree

.github/workflows/android.yml

Lines changed: 15 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,6 @@ jobs:
2525
run: sdkmanager "build-tools;29.0.3"
2626
- name: Run common unit tests
2727
run: bash ./gradlew :common:cleanTestDebugUnitTest :common:testDebugUnitTest
28-
- name: Build Release AAB
29-
id: buildRelease
30-
run: ./gradlew bundleRelease
31-
- name: Sign AAB
32-
id: sign
33-
uses: r0adkll/sign-android-release@v1
34-
with:
35-
releaseDirectory: android/build/outputs/bundle/release
36-
signingKeyBase64: ${{ secrets.KEYSTORE_B64 }}
37-
alias: ${{ secrets.KEY_ALIAS }}
38-
keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
39-
keyPassword: ${{ secrets.KEYSTORE_PASSWORD }}
40-
- name: Upload AAB to Play Store
41-
uses: r0adkll/upload-google-play@v1
42-
with:
43-
serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
44-
packageName: com.inspiredandroid.linuxcommandbibliotheca
45-
releaseFiles: android/build/outputs/bundle/release/android-release.aab
46-
track: beta
47-
status: draft
48-
mappingFile: android/build/outputs/mapping/release/mapping.txt
4928
- name: Build APK
5029
run: bash ./gradlew assembleRelease --stacktrace
5130
- name: Sign APK
@@ -56,17 +35,17 @@ jobs:
5635
alias: ${{ secrets.KEY_ALIAS }}
5736
keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
5837
keyPassword: ${{ secrets.KEYSTORE_PASSWORD }}
59-
- name: Upload APK
38+
- name: Upload APK Artifact
6039
uses: actions/upload-artifact@v4
6140
with:
62-
name: apk
41+
name: signed-apk
6342
path: android/build/outputs/apk/release/android-release-unsigned-signed.apk
6443
- name: Build cli JAR
6544
run: bash ./gradlew :cli:createJar
66-
- name: Upload cli JAR
45+
- name: Upload cli JAR Artifact
6746
uses: actions/upload-artifact@v4
6847
with:
69-
name: jar
48+
name: cli-jar
7049
path: cli/build/libs/linuxcommandlibrary.jar
7150

7251
release:
@@ -76,14 +55,14 @@ jobs:
7655
steps:
7756
- name: Checkout
7857
uses: actions/checkout@v2.4.0
79-
- name: Download APK from build
58+
- name: Download APK Artifact
8059
uses: actions/download-artifact@v4.1.7
8160
with:
82-
name: apk
83-
- name: Download JAR from build
61+
name: signed-apk
62+
- name: Download JAR Artifact
8463
uses: actions/download-artifact@v4.1.7
8564
with:
86-
name: jar
65+
name: cli-jar
8766
- name: Create Github Release
8867
id: create_release
8968
uses: actions/create-release@v1
@@ -92,23 +71,23 @@ jobs:
9271
with:
9372
tag_name: ${{ github.ref }}
9473
release_name: Release ${{ github.ref }}
95-
- name: Upload Github Release APK
96-
id: upload_release_asset
74+
- name: Upload APK to Github Release
75+
id: upload_apk
9776
uses: actions/upload-release-asset@v1.0.1
9877
env:
9978
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
10079
with:
10180
upload_url: ${{ steps.create_release.outputs.upload_url }}
102-
asset_path: android/build/outputs/apk/release/android-release-unsigned-signed.apk
103-
asset_name: ${{ github.event.repository.name }}.apk
81+
asset_path: android-release-unsigned-signed.apk
82+
asset_name: LinuxCommandLibrary.apk
10483
asset_content_type: application/zip
105-
- name: Upload Github Release cli JAR
106-
id: upload_release_asset2
84+
- name: Upload JAR to Github Release
85+
id: upload_jar
10786
uses: actions/upload-release-asset@v1.0.1
10887
env:
10988
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
11089
with:
11190
upload_url: ${{ steps.create_release.outputs.upload_url }}
112-
asset_path: cli/build/libs/linuxcommandlibrary.jar
91+
asset_path: linuxcommandlibrary.jar
11392
asset_name: linuxcommandlibrary.jar
11493
asset_content_type: application/zip

android/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ android {
3939
applicationId = "com.inspiredandroid.linuxcommandbibliotheca"
4040
minSdk = 24
4141
targetSdk = 35
42-
versionCode = 92
42+
versionCode = 93
4343
versionName = project.version.toString()
4444
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
4545
}

0 commit comments

Comments
 (0)