Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion .github/workflows/fork-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -302,15 +302,20 @@ jobs:
# mode=auto, not update: an OTA alone never reaches a phone when the
# native runtime changed, so the fingerprint decides between an update
# and a TestFlight build. iOS only, because Android has no keystore.
# release_branch must match: the mobile workflows check out that branch
# and verify the SHA is contained by it. Defaulting it to
# fork/integration there would reject every fork/dev SHA.
gh workflow run mobile-eas-production.yml \
--repo "$GITHUB_REPOSITORY" \
--ref "$RELEASE_REF" \
-f mode=auto \
-f platform=ios \
-f sha="$GITHUB_SHA" \
-f release_branch="$RELEASE_REF" \
-f message="${RELEASE_REF} ${GITHUB_SHA}"
gh workflow run mobile-eas-development.yml \
--repo "$GITHUB_REPOSITORY" \
--ref "$RELEASE_REF" \
-f platform=ios \
-f sha="$GITHUB_SHA"
-f sha="$GITHUB_SHA" \
-f release_branch="$RELEASE_REF"
6 changes: 3 additions & 3 deletions .github/workflows/mobile-eas-development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
required: false
type: string
sha:
description: "Exact fork/integration SHA (blank uses its current tip)"
description: "Exact release-branch SHA (blank uses that branch's current tip)"
required: false
type: string

Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
if: steps.expo-token.outputs.present == 'true'
uses: actions/checkout@v6
with:
ref: fork/integration
ref: ${{ inputs.release_branch }}
fetch-depth: 0

- name: Resolve approved integration source
Expand All @@ -81,7 +81,7 @@ jobs:
echo "sha=$target_sha" >> "$GITHUB_OUTPUT"

- name: Overlay deploy tooling from workflow ref
if: steps.expo-token.outputs.present == 'true' && github.ref_name != 'fork/integration'
if: steps.expo-token.outputs.present == 'true' && github.ref_name != inputs.release_branch
env:
WORKFLOW_SHA: ${{ github.sha }}
run: |
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/mobile-eas-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,14 @@ on:
required: false
type: string
sha:
description: "Exact fork/integration SHA (blank uses its current tip)"
description: "Exact release-branch SHA (blank uses that branch's current tip)"
required: false
type: string
release_branch:
description: "Release branch that must contain the SHA"
required: false
type: string
default: fork/integration

concurrency:
group: mobile-eas-production
Expand Down Expand Up @@ -78,7 +83,7 @@ jobs:
if: steps.expo-token.outputs.present == 'true'
uses: actions/checkout@v6
with:
ref: fork/integration
ref: ${{ inputs.release_branch }}
fetch-depth: 0
# No sparse-checkout here: it makes actions/checkout fetch with
# --filter=blob:none, and eas-cli archives the project via
Expand Down Expand Up @@ -108,7 +113,7 @@ jobs:
# the deploy script + app.config runtime override from the workflow ref so
# we can ship fixes without waiting for a full compose.
- name: Overlay deploy tooling from workflow ref
if: steps.expo-token.outputs.present == 'true' && github.ref_name != 'fork/integration'
if: steps.expo-token.outputs.present == 'true' && github.ref_name != inputs.release_branch
env:
WORKFLOW_SHA: ${{ github.sha }}
run: |
Expand Down
Loading