Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Fix APK rename collision in release workflows

Barnabas328ab0d3c052
diff --git a/.github/workflows/all-release.yml b/.github/workflows/all-release.yml
index aee022a2..533b3871 100644
--- a/.github/workflows/all-release.yml
+++ b/.github/workflows/all-release.yml
@@ -149,8 +149,11 @@ jobs:
env:
RAW: ${{ steps.version.outputs.raw }}
run: |
+ # gradle already names the APK absorb-<version>-<code>.apk, so skip
+ # the mv when source and destination are the same file.
APK_SRC=$(ls build/app/outputs/apk/github/release/*.apk | head -1)
- mv "$APK_SRC" "build/app/outputs/apk/github/release/absorb-${RAW//+/-}.apk"
+ APK_DST="build/app/outputs/apk/github/release/absorb-${RAW//+/-}.apk"
+ [ "$APK_SRC" = "$APK_DST" ] || mv "$APK_SRC" "$APK_DST"
AAB_SRC=$(ls build/app/outputs/bundle/playstoreRelease/*.aab | head -1)
mv "$AAB_SRC" "build/app/outputs/bundle/playstoreRelease/absorb-${RAW}.aab"
IPA_SRC=$(ls build/ios/ipa/*.ipa | head -1)
diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
index 90db69d4..632cd726 100644
--- a/.github/workflows/android-release.yml
+++ b/.github/workflows/android-release.yml
@@ -80,8 +80,11 @@ jobs:
env:
RAW: ${{ steps.version.outputs.raw }}
run: |
+ # gradle already names the APK absorb-<version>-<code>.apk, so skip
+ # the mv when source and destination are the same file.
APK_SRC=$(ls build/app/outputs/apk/github/release/*.apk | head -1)
- mv "$APK_SRC" "build/app/outputs/apk/github/release/absorb-${RAW//+/-}.apk"
+ APK_DST="build/app/outputs/apk/github/release/absorb-${RAW//+/-}.apk"
+ [ "$APK_SRC" = "$APK_DST" ] || mv "$APK_SRC" "$APK_DST"
AAB_SRC=$(ls build/app/outputs/bundle/playstoreRelease/*.aab | head -1)
mv "$AAB_SRC" "build/app/outputs/bundle/playstoreRelease/absorb-${RAW}.aab"
diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml
index 06134a7e..68361959 100644
--- a/.github/workflows/github-release.yml
+++ b/.github/workflows/github-release.yml
@@ -76,8 +76,11 @@ jobs:
env:
RAW: ${{ steps.version.outputs.raw }}
run: |
+ # gradle already names the APK absorb-<version>-<code>.apk, so skip
+ # the mv when source and destination are the same file.
APK_SRC=$(ls build/app/outputs/apk/github/release/*.apk | head -1)
- mv "$APK_SRC" "build/app/outputs/apk/github/release/absorb-${RAW//+/-}.apk"
+ APK_DST="build/app/outputs/apk/github/release/absorb-${RAW//+/-}.apk"
+ [ "$APK_SRC" = "$APK_DST" ] || mv "$APK_SRC" "$APK_DST"
- name: Upload APK to GitHub draft release
env: