Various changes to workflow files

rhunk · Jul 6, 2024 · 06ba13f · 06ba13f
1 parent 09e3e83
commit 06ba13f
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 122 deletions.
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
@@ -16,10 +16,10 @@ jobs:
  with:
  submodules: 'recursive'
 
- - name: set up JDK 17
+ - name: Set up JDK 21
  uses: actions/setup-java@v4
  with:
- java-version: '17'
+ java-version: '21'
  distribution: 'temurin'
  cache: gradle
 
@@ -32,41 +32,32 @@ jobs:
  - name: Build
  run: ./gradlew assembleArmv8Debug
 
+ - name: Determine the latest Build Tools version installed
+ shell: bash
+ run: echo "BUILD_TOOL_VERSION=$(ls "$ANDROID_HOME/build-tools/" | tail -n 1)" >> $GITHUB_ENV
+
  - name: Sign APK
  id: sign_app
- uses: tiann/zipalign-sign-android-release@v1.1.4
+ uses: noriban/sign-android-release@master
  with:
  releaseDirectory: app/build/outputs/apk/armv8/debug/
  signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }}
  alias: ${{ secrets.KEY_ALIAS }}
  keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
  keyPassword: ${{ secrets.KEY_PASSWORD }}
- zipAlign: true
  env:
- BUILD_TOOLS_VERSION: "34.0.0"
-
- - name: Delete unsigned file
- run: |
- cd app/build/outputs/apk/armv8/debug/
- shopt -s extglob
- rm -rf !(*-signed*)
-
- - name: Build Version
- run: ./gradlew getVersion
+ BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
 
- - name: Set Environment Variables
+ - name: Get current build version
  id: version-env
  run: |
+ ./gradlew getVersion
  echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV
- echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
- - name: Git branch name
- id: git-branch-name
- uses: EthanSK/git-branch-name-action@main
-
- - name: Rename APK file
+ - name: Delete unsigned APK file and rename the signed one
  run: |
- mv app/build/outputs/apk/armv8/debug/*.apk app/build/outputs/apk/armv8/debug/snapenhance-${{ env.version }}-armv8-${{ steps.version-env.outputs.sha_short }}.apk
+ find app/build/outputs/apk/armv8/debug/ -type f ! -name '*-signed*' -delete
+ mv ${{steps.sign_app.outputs.signedReleaseFile}} app/build/outputs/apk/armv8/debug/snapenhance-${{ env.version }}-armv8-${GITHUB_SHA::7}.apk
 
  - name: Upload artifact
  uses: actions/upload-artifact@v4
@@ -82,10 +73,10 @@ jobs:
  with:
  submodules: 'recursive'
 
- - name: set up JDK 17
+ - name: Set up JDK 21
  uses: actions/setup-java@v4
  with:
- java-version: '17'
+ java-version: '21'
  distribution: 'temurin'
  cache: gradle
 
@@ -98,41 +89,32 @@ jobs:
  - name: Build
  run: ./gradlew assembleArmv7Debug
 
+ - name: Determine the latest Build Tools version installed
+ shell: bash
+ run: echo "BUILD_TOOL_VERSION=$(ls "$ANDROID_HOME/build-tools/" | tail -n 1)" >> $GITHUB_ENV
+
  - name: Sign APK
  id: sign_app
- uses: tiann/zipalign-sign-android-release@v1.1.4
+ uses: noriban/sign-android-release@master
  with:
  releaseDirectory: app/build/outputs/apk/armv7/debug/
  signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }}
  alias: ${{ secrets.KEY_ALIAS }}
  keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
  keyPassword: ${{ secrets.KEY_PASSWORD }}
- zipAlign: true
  env:
- BUILD_TOOLS_VERSION: "34.0.0"
-
- - name: Delete unsigned file
- run: |
- cd app/build/outputs/apk/armv7/debug/
- shopt -s extglob
- rm -rf !(*-signed*)
+ BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
 
- - name: Build Version
- run: ./gradlew getVersion
-
- - name: Set Environment Variables
+ - name: Get current build version
  id: version-env
  run: |
+ ./gradlew getVersion
  echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV
- echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
- - name: Git branch name
- id: git-branch-name
- uses: EthanSK/git-branch-name-action@main
 
- - name: Rename APK file
+ - name: Delete unsigned APK file and rename the signed one
  run: |
- mv app/build/outputs/apk/armv7/debug/*.apk app/build/outputs/apk/armv7/debug/snapenhance-${{ env.version }}-armv7-${{ steps.version-env.outputs.sha_short }}.apk
+ find app/build/outputs/apk/armv7/debug/ -type f ! -name '*-signed*' -delete
+ mv ${{steps.sign_app.outputs.signedReleaseFile}} app/build/outputs/apk/armv7/debug/snapenhance-${{ env.version }}-armv7-${GITHUB_SHA::7}.apk
 
  - name: Upload artifact
  uses: actions/upload-artifact@v4
@@ -148,10 +130,10 @@ jobs:
  with:
  submodules: 'recursive'
 
- - name: set up JDK 17
+ - name: Set up JDK 21
  uses: actions/setup-java@v4
  with:
- java-version: '17'
+ java-version: '21'
  distribution: 'temurin'
  cache: gradle
 
@@ -164,41 +146,32 @@ jobs:
  - name: Build
  run: ./gradlew assembleAllDebug
 
+ - name: Determine the latest Build Tools version installed
+ shell: bash
+ run: echo "BUILD_TOOL_VERSION=$(ls "$ANDROID_HOME/build-tools/" | tail -n 1)" >> $GITHUB_ENV
+
  - name: Sign APK
  id: sign_app
- uses: tiann/zipalign-sign-android-release@v1.1.4
+ uses: noriban/sign-android-release@master
  with:
  releaseDirectory: app/build/outputs/apk/all/debug/
  signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }}
  alias: ${{ secrets.KEY_ALIAS }}
  keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
  keyPassword: ${{ secrets.KEY_PASSWORD }}
- zipAlign: true
  env:
- BUILD_TOOLS_VERSION: "34.0.0"
+ BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
 
- - name: Delete unsigned file
- run: |
- cd app/build/outputs/apk/all/debug/
- shopt -s extglob
- rm -rf !(*-signed*)
-
- - name: Build Version
- run: ./gradlew getVersion
-
- - name: Set Environment Variables
+ - name: Get current build version
  id: version-env
  run: |
+ ./gradlew getVersion
  echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV
- echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
- - name: Git branch name
- id: git-branch-name
- uses: EthanSK/git-branch-name-action@main
 
- - name: Rename APK files
+ - name: Delete unsigned APK file and rename the signed one
  run: |
- mv app/build/outputs/apk/all/debug/*.apk app/build/outputs/apk/all/debug/snapenhance-${{ env.version }}-universal-${{ steps.version-env.outputs.sha_short }}.apk
+ find app/build/outputs/apk/all/debug/ -type f ! -name '*-signed*' -delete
+ mv ${{steps.sign_app.outputs.signedReleaseFile}} app/build/outputs/apk/all/debug/snapenhance-${{ env.version }}-universal-${GITHUB_SHA::7}.apk
 
  - name: Upload universal
  uses: actions/upload-artifact@v4
@@ -214,10 +187,10 @@ jobs:
  with:
  submodules: 'recursive'
 
- - name: set up JDK 17
+ - name: Set up JDK 21
  uses: actions/setup-java@v4
  with:
- java-version: '17'
+ java-version: '21'
  distribution: 'temurin'
  cache: gradle
 
@@ -241,10 +214,10 @@ jobs:
  with:
  submodules: 'recursive'
 
- - name: set up JDK 17
+ - name: Set up JDK 21
  uses: actions/setup-java@v4
  with:
- java-version: '17'
+ java-version: '21'
  distribution: 'temurin'
  cache: gradle
 
@@ -258,4 +231,4 @@ jobs:
  uses: actions/upload-artifact@v4
  with:
  name: core
- path: app/build/outputs/apk/core/debug/*.apk
+ path: app/build/outputs/apk/core/debug/*.apk