mirror of
https://github.com/pezkuwichain/pezkuwi-wallet-utils.git
synced 2026-07-13 06:55:46 +00:00
pezkuwichain
e5339235ad
The live Play Store release (wallet-android 85bde7e, published 2026-06-15) was built against whatever was on this branch's HEAD at the time - which, since master had received no commits between 2026-03-02 and this week, was commit7a087cf. This week's changes (nova-base sync, Tron config/icons, balance test fixtures, etc.) are real and wanted, but they've made master incompatible with that still-live app version, and live users installing fresh right now get a completely empty tokens list because of it (the app's chain sync silently fails whole-hog on any single malformed/incompatible chain entry, leaving new installs with zero locally-cached chains). This makes master's served content match7a087cfexactly, stopping the bleeding for current live users without needing an emergency app release. None of this week's work is lost - it's all preserved on pending/post-fix-release and will come back once wallet-android's Tron send feature is complete and both repos can ship together in one coordinated release.
49 lines
1.3 KiB
YAML
49 lines
1.3 KiB
YAML
name: Auto Merge
|
|
|
|
on:
|
|
workflow_run:
|
|
workflows: ["Code Quality"]
|
|
types: [completed]
|
|
|
|
jobs:
|
|
auto-merge:
|
|
runs-on: ubuntu-latest
|
|
if: >
|
|
github.event.workflow_run.conclusion == 'success' &&
|
|
github.event.workflow_run.event == 'pull_request'
|
|
permissions:
|
|
contents: write
|
|
pull-requests: write
|
|
steps:
|
|
- name: Find and merge master → main PR
|
|
env:
|
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
run: |
|
|
HEAD_BRANCH="${{ github.event.workflow_run.head_branch }}"
|
|
echo "Workflow ran on branch: $HEAD_BRANCH"
|
|
|
|
# Only merge PRs from master to main
|
|
if [ "$HEAD_BRANCH" != "master" ]; then
|
|
echo "Not a master branch PR, skipping"
|
|
exit 0
|
|
fi
|
|
|
|
PR_NUMBER=$(gh pr list \
|
|
--repo "$GITHUB_REPOSITORY" \
|
|
--base main \
|
|
--head master \
|
|
--state open \
|
|
--json number \
|
|
--jq '.[0].number')
|
|
|
|
if [ -z "$PR_NUMBER" ]; then
|
|
echo "No open PR from master to main found, skipping"
|
|
exit 0
|
|
fi
|
|
|
|
echo "Merging PR #$PR_NUMBER"
|
|
gh pr merge "$PR_NUMBER" \
|
|
--repo "$GITHUB_REPOSITORY" \
|
|
--merge \
|
|
--delete-branch=false
|