Skip to content

Commit 1125d82

Browse files
make target var and fix eof
1 parent 8fecfed commit 1125d82

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,16 @@ jobs:
6262
name: 'Publish Release'
6363
needs: [bump-version, build-android]
6464
runs-on: ubuntu-latest
65+
env:
66+
MERGE_TARGET: master
6567
steps:
6668
- name: Set environment variables
6769
run: |
6870
echo "VERSION=${{ inputs.version }}" >> $GITHUB_ENV
6971
7072
- uses: actions/checkout@v4
7173
with:
72-
ref: master
74+
ref: ${{ env.MERGE_TARGET }}
7375

7476
- name: Download iOS App
7577
uses: actions/download-artifact@v4
@@ -98,5 +100,5 @@ jobs:
98100
- name: Merge Release
99101
run: |
100102
git merge release/${{ env.VERSION }} \
101-
&& git push origin master \
102-
|| gh pr create --title "Merge Release ${{ env.VERSION }}" --body "Merge of the release ${{ env.VERSION }} into master failed. Please it merge manually."
103+
&& git push origin ${{ env.MERGE_TARGET }} \
104+
|| gh pr create --title "Merge Release ${{ env.VERSION }}" --body "Merge of the release ${{ env.VERSION }} into ${{ env.MERGE_TARGET }} failed. Please it merge manually."

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ jobs:
5353
-timezone US/Pacific
5454
script: |
5555
adb install -r -d app-release.apk
56-
maestro test maestro --debug-output maestro-logs --env=APP_ID=com.sentry_react_native
56+
maestro test maestro --debug-output maestro-logs --env=APP_ID=com.sentry_react_native

0 commit comments

Comments
 (0)