Skip to content

Commit 7dbaa2f

Browse files
committed
Temporary use release_automatin as unstable, fix publising for unstable
1 parent 9327a0b commit 7dbaa2f

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.github/workflows/build-n-test.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99
type: string
1010
required: false
1111

12+
env:
13+
UNSTABLE_BRANCH: release_automation
14+
1215
jobs:
1316
build:
1417
strategy:
@@ -26,7 +29,7 @@ jobs:
2629
- name: Checkout repository
2730
uses: actions/checkout@v4
2831
with:
29-
ref: ${{ inputs.release_tag == 'unstable' && 'unstable' || '' }}
32+
ref: ${{ inputs.release_tag == 'unstable' && env.UNSTABLE_BRANCH || '' }}
3033

3134
- name: Ensure Release Branch
3235
if: inputs.release_tag != '' && inputs.release_tag != 'unstable'
@@ -73,7 +76,7 @@ jobs:
7376
- name: Checkout repository
7477
uses: actions/checkout@v4
7578
with:
76-
ref: ${{ inputs.release_tag == 'unstable' && 'unstable' || '' }}
79+
ref: ${{ inputs.release_tag == 'unstable' && env.UNSTABLE_BRANCH || '' }}
7780

7881
- name: Ensure Release Branch
7982
if: inputs.release_tag != '' && inputs.release_tag != 'unstable'

.github/workflows/release_publish.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
echo "env_name=$env_name" >> $GITHUB_OUTPUT
4646
4747
- name: Ensure Release Branch
48+
if: github.event.inputs.release_tag != 'unstable'
4849
id: ensure-branch
4950
uses: redis-developer/redis-oss-release-automation/.github/actions/ensure-release-branch@main
5051
with:
@@ -70,6 +71,7 @@ jobs:
7071
snapcraft_store_credentials: ${{ secrets.SNAP_TOKEN }}
7172

7273
- name: Merge back to release branch
74+
if: github.event.inputs.release_tag != 'unstable' && github.event.inputs.release_type == 'public'
7375
id: merge-back
7476
# merge only public releases into main
7577
uses: redis-developer/redis-oss-release-automation/.github/actions/merge-branches-verified@main

0 commit comments

Comments
 (0)