Skip to content

Commit 54dd603

Browse files
committed
Revert "test: temporarily use version 233 to test smart APK checking"
This reverts commit 50a115b.
1 parent 5c09b10 commit 54dd603

File tree

1 file changed

+12
-18
lines changed

1 file changed

+12
-18
lines changed

.github/workflows/release.yml

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,7 @@ jobs:
263263
- name: Create Release
264264
uses: softprops/action-gh-release@v2
265265
with:
266-
# TESTING: Use hardcoded tag
267-
tag_name: v2.3.3-test
266+
tag_name: ${{ needs.prepare.outputs.version }}
268267
name: Release ${{ needs.prepare.outputs.version }}
269268
body_path: CHANGELOG.md
270269
draft: false
@@ -386,9 +385,8 @@ jobs:
386385
387386
download-signed-apk:
388387
name: Download Google Play Signed APK
389-
# TESTING: Temporarily remove dependencies for testing
390-
# needs: [prepare, play-store-upload]
391-
# if: ${{ vars.ENABLE_PLAY_STORE_UPLOAD == 'true' && vars.ENABLE_SIGNING == 'true' }}
388+
needs: [prepare, play-store-upload]
389+
if: ${{ vars.ENABLE_PLAY_STORE_UPLOAD == 'true' && vars.ENABLE_SIGNING == 'true' }}
392390
runs-on: ubuntu-latest
393391

394392
steps:
@@ -408,8 +406,7 @@ jobs:
408406
env:
409407
PLAY_STORE_SERVICE_ACCOUNT_JSON: ${{ secrets.PLAY_STORE_SERVICE_ACCOUNT_JSON }}
410408
run: |
411-
# Temporarily test with known existing version 2.3.3 (version code 233)
412-
VERSION_CODE="233"
409+
VERSION_CODE="${{ needs.prepare.outputs.version_code }}"
413410
PACKAGE_NAME="me.ghui.v2er"
414411
415412
# Create Python script to check if APK exists
@@ -522,9 +519,8 @@ jobs:
522519
env:
523520
PLAY_STORE_SERVICE_ACCOUNT_JSON: ${{ secrets.PLAY_STORE_SERVICE_ACCOUNT_JSON }}
524521
run: |
525-
# TESTING: Use hardcoded version 2.3.3 which exists in Google Play
526-
VERSION_NAME="v2.3.3"
527-
VERSION_CODE="233"
522+
VERSION_NAME="${{ needs.prepare.outputs.version }}"
523+
VERSION_CODE="${{ needs.prepare.outputs.version_code }}"
528524
PACKAGE_NAME="me.ghui.v2er"
529525
530526
# Create Python script to download signed universal APK
@@ -713,9 +709,8 @@ jobs:
713709
if: steps.download-apk.outputs.found == 'true'
714710
id: play-link
715711
run: |
716-
# TESTING: Use hardcoded version 2.3.3
717-
VERSION_NAME="v2.3.3"
718-
VERSION_CODE="233"
712+
VERSION_NAME="${{ needs.prepare.outputs.version }}"
713+
VERSION_CODE="${{ needs.prepare.outputs.version_code }}"
719714
720715
# Create info file about Google Play signing
721716
cat > "v2er-${VERSION_NAME}_google_play_signed_info.txt" << EOF
@@ -743,8 +738,7 @@ jobs:
743738
if: steps.download-apk.outputs.found == 'true'
744739
uses: softprops/action-gh-release@v2
745740
with:
746-
# TESTING: Use hardcoded tag
747-
tag_name: v2.3.3-test
741+
tag_name: ${{ needs.prepare.outputs.version }}
748742
files: |
749743
${{ steps.download-apk.outputs.apk_path }}
750744
${{ steps.play-link.outputs.info_path }}
@@ -759,9 +753,9 @@ jobs:
759753
if [ "${{ steps.download-apk.outputs.found }}" = "true" ]; then
760754
echo "✅ **Universal APK generated successfully**" >> $GITHUB_STEP_SUMMARY
761755
echo "" >> $GITHUB_STEP_SUMMARY
762-
echo "- **Version**: v2.3.3" >> $GITHUB_STEP_SUMMARY
763-
echo "- **Version Code**: 233" >> $GITHUB_STEP_SUMMARY
764-
echo "- **File**: v2er-v2.3.3_google_play_signed.apk" >> $GITHUB_STEP_SUMMARY
756+
echo "- **Version**: ${{ needs.prepare.outputs.version }}" >> $GITHUB_STEP_SUMMARY
757+
echo "- **Version Code**: ${{ needs.prepare.outputs.version_code }}" >> $GITHUB_STEP_SUMMARY
758+
echo "- **File**: v2er-${{ needs.prepare.outputs.version }}_google_play_signed.apk" >> $GITHUB_STEP_SUMMARY
765759
echo "" >> $GITHUB_STEP_SUMMARY
766760
echo "### Notes" >> $GITHUB_STEP_SUMMARY
767761
echo "- This APK is generated from the AAB uploaded to Google Play" >> $GITHUB_STEP_SUMMARY

0 commit comments

Comments
 (0)