Skip to content

fix: pass keystore inputs in re-sign step #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thymikee merged 3 commits into from
Dec 15, 2025
Merged

fix: pass keystore inputs in re-sign step #18

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
600c59c
fix: pass keystore inputs in re-sign step
LukasMod Dec 15, 2025
abd2d35
Merge branch 'main' of github.com:LukasMod/android into fix/re-sign-k…
LukasMod Dec 15, 2025
5f0adf8
fix: use KEYSTORE_TARGET_PATH
LukasMod Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ runs:
shell: bash

- name: Determine Android sourceDir and appName
if: ${{ !env.ARTIFACT_URL }}
if: ${{ !env.ARTIFACT_URL || (env.ARTIFACT_URL && inputs.re-sign) }}
run: |
JSON_OUTPUT=$(npx rock config -p android) || (echo "$JSON_OUTPUT" && exit 1)
echo "$JSON_OUTPUT" | jq -r '.project'
Expand All @@ -214,7 +214,7 @@ runs:
working-directory: ${{ inputs.working-directory }}

- name: Decode and store keystore file
if: ${{ !env.ARTIFACT_URL && inputs.sign }}
if: ${{ (!env.ARTIFACT_URL && inputs.sign) || (env.ARTIFACT_URL && inputs.re-sign) }}
run: |
if [ -n "$APP_NAME" ]; then
KEYSTORE_TARGET_PATH="$ANDROID_SOURCE_DIR/$APP_NAME/${{ inputs.keystore-path }}"
Expand All @@ -236,6 +236,7 @@ runs:
echo "${{ inputs.keystore-base64 }}" | base64 --decode > "$KEYSTORE_TARGET_PATH"
echo "Successfully copied keystore base64 to target path: $KEYSTORE_TARGET_PATH"
fi
echo "KEYSTORE_TARGET_PATH=$KEYSTORE_TARGET_PATH" >> $GITHUB_ENV
shell: bash
working-directory: ${{ inputs.working-directory }}

Expand Down Expand Up @@ -268,7 +269,11 @@ runs:
if: ${{ env.ARTIFACT_URL && inputs.re-sign == 'true' }}
run: |
npx rock sign:android "${{ env.ARTIFACT_PATH }}" \
--build-jsbundle
--build-jsbundle \
--keystore "$KEYSTORE_TARGET_PATH" \
--keystore-password "${{ inputs.keystore-store-password }}" \
--key-alias "${{ inputs.keystore-key-alias }}" \
--key-password "${{ inputs.keystore-key-password }}"
shell: bash
working-directory: ${{ inputs.working-directory }}

Expand Down Expand Up @@ -339,10 +344,9 @@ runs:
npx rock remote-cache delete --name ${{ env.ARTIFACT_NAME }} --all-but-latest --json
shell: bash

- name: Clean Up Keystore and gradle properties (signed builds only)
if: ${{ !env.ARTIFACT_URL && inputs.sign }}
- name: Clean Up Keystore
if: ${{ (!env.ARTIFACT_URL && inputs.sign) || (env.ARTIFACT_URL && inputs.re-sign) }}
run: |
rm $HOME/.gradle/gradle.properties
if [ -n "$APP_NAME" ]; then
rm "$ANDROID_SOURCE_DIR/$APP_NAME/${{ inputs.keystore-path }}"
else
Expand All @@ -351,6 +355,13 @@ runs:
shell: bash
working-directory: ${{ inputs.working-directory }}

- name: Clean Up gradle properties (signed builds only)
if: ${{ !env.ARTIFACT_URL && inputs.sign }}
run: |
rm $HOME/.gradle/gradle.properties
shell: bash
working-directory: ${{ inputs.working-directory }}

- name: Post Build
if: ${{ github.event_name == 'pull_request' && inputs.comment-bot == 'true' }}
uses: callstackincubator/android/.github/actions/rock-post-build@v3
Expand Down