Skip to content

Commit 14cb5b1

Browse files
committed
feat(ci): modernize & use tags instead of release branch
1 parent 95c719e commit 14cb5b1

File tree

2 files changed

+31
-50
lines changed

2 files changed

+31
-50
lines changed

.github/workflows/build.yml

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,34 @@ name: Build APK
22

33
on:
44
push:
5-
branches-ignore:
6-
- 'release'
7-
paths-ignore:
8-
- '**.md'
5+
paths-ignore: [ '**.md' ]
96
pull_request:
10-
branches:
11-
- '*'
12-
paths-ignore:
13-
- '**.md'
7+
paths-ignore: [ '**.md' ]
148
workflow_dispatch:
159

1610
jobs:
1711
build:
18-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-latest
1913
timeout-minutes: 5
2014
steps:
2115
- name: Checkout repository
22-
uses: actions/checkout@v2
16+
uses: actions/checkout@v4
2317

24-
- name: Set up JDK 17
25-
uses: actions/setup-java@v2
18+
- name: Set up JDK 21
19+
uses: actions/setup-java@v4
2620
with:
27-
java-version: 17
28-
distribution: 'zulu'
21+
java-version: 21
22+
distribution: "temurin"
2923

3024
- name: Build
3125
run: |
3226
chmod +x ./gradlew
33-
CI=true ./gradlew :app:packageReleaseUniversalApk
27+
./gradlew :app:assembleRelease --stacktrace --no-daemon
3428
3529
- name: Upload Artifact
36-
uses: actions/upload-artifact@v2
30+
uses: actions/upload-artifact@v4
3731
with:
38-
name: xspoofsignatures
32+
name: XSpoofSignatures
33+
if-no-files-found: error
3934
path: |
40-
app/build/outputs/apk_from_bundle/release/app-release-universal.apk
35+
app/build/outputs/apk/release/app-release.apk

.github/workflows/release.yml

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,26 @@
1-
name: Build and publish release
1+
name: Publish Release
22

33
concurrency:
44
group: "release"
55
cancel-in-progress: true
66

77
on:
88
push:
9-
branches:
10-
- 'release'
11-
workflow_dispatch:
9+
tags: [ "*.*.*" ]
1210

1311
jobs:
1412
build:
15-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-latest
1614
timeout-minutes: 5
1715
steps:
1816
- name: Checkout repository
19-
uses: actions/checkout@v2
20-
with:
21-
ref: release
22-
23-
- name: Test version
24-
id: version
25-
run: |
26-
version=$(cat app/build.gradle.kts | grep -E 'versionName = "' | cut -d \" -f 2)
27-
if git show-ref --tags --quiet --verify -- "refs/tags/$version" >/dev/null; then
28-
echo "Git tag $version already exists, failing to publish";
29-
exit 1
30-
else
31-
echo "::set-output name=release_tag::$version"
32-
fi
17+
uses: actions/checkout@v4
3318

34-
- name: Set up JDK 17
35-
uses: actions/setup-java@v2
19+
- name: Set up JDK 21
20+
uses: actions/setup-java@v4
3621
with:
37-
java-version: 17
38-
distribution: 'zulu'
22+
java-version: 21
23+
distribution: "temurin"
3924

4025
- name: Build
4126
env:
@@ -44,22 +29,23 @@ jobs:
4429
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
4530
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
4631
run: |
47-
chmod +x ./gradlew
4832
echo '${{ secrets.KEYSTORE }}' | base64 -d > ./release.jks
49-
CI=true RELEASE=true ./gradlew :app:packageReleaseUniversalApk
50-
mv -T ./app/build/outputs/apk_from_bundle/release/app-release-universal.apk XSpoofSignatures-${{ steps.version.outputs.release_tag }}.apk
33+
chmod +x ./gradlew
34+
RELEASE=true ./gradlew :app:assembleRelease --stacktrace --no-daemon
35+
mv -T ./app/build/outputs/apk/release/app-release.apk dev.rushii.xspoofsignatures-${{ github.ref_name }}.apk
5136
5237
- name: Upload Artifact
53-
uses: actions/upload-artifact@v2
38+
uses: actions/upload-artifact@v4
5439
with:
55-
name: xspoofsignatures
40+
name: XSpoofSignatures
41+
if-no-files-found: error
5642
path: |
57-
XSpoofSignatures-${{ steps.version.outputs.release_tag }}.apk
43+
dev.rushii.xspoofsignatures-${{ github.ref_name }}.apk
5844
5945
- name: Publish release
60-
uses: softprops/action-gh-release@v1
46+
uses: softprops/action-gh-release@v2
6147
with:
62-
tag_name: ${{ steps.version.outputs.release_tag }}
48+
tag_name: v${{ github.ref_name }}
6349
generate_release_notes: true
6450
fail_on_unmatched_files: true
65-
files: XSpoofSignatures-${{ steps.version.outputs.release_tag }}.apk
51+
files: dev.rushii.xspoofsignatures-${{ github.ref_name }}.apk

0 commit comments

Comments
 (0)