Skip to content

Commit 55226e6

Browse files
authored
Merge pull request #73 from redis/unstable_fix_checkout_8.4
Unstable fix checkout 8.4
2 parents 8c6ec1d + ab5463a commit 55226e6

File tree

3 files changed

+24
-10
lines changed

3 files changed

+24
-10
lines changed

.github/actions/parse-env-file/action.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,11 @@ outputs:
2424
runs:
2525
using: "composite"
2626
steps:
27-
- name: Checkout code
28-
uses: actions/checkout@v4
29-
3027
- name: Parse release handle
3128
id: parse
3229
shell: bash
3330
run: |
3431
cat "${{ inputs.env_file_path }}" | while IFS= read -r line || [[ -n "$line" ]]; do
3532
[[ -z "$line" || "$line" =~ ^# ]] && continue
3633
echo "$line" >> "$GITHUB_OUTPUT"
37-
done
34+
done

.github/workflows/apt.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,15 @@ jobs:
3636
steps:
3737
- name: Checkout code
3838
uses: actions/checkout@v4
39+
with:
40+
ref: >-
41+
${{ (github.ref_name == 'unstable'
42+
|| github.event_name == 'workflow_dispatch'
43+
|| github.event_name == 'workflow_call'
44+
|| github.event_name == 'schedule')
45+
&& 'unstable'
46+
|| ''
47+
}}
3948
4049
- name: Parse vars
4150
id: parse
@@ -65,4 +74,4 @@ jobs:
6574
|| github.event_name == 'schedule')
6675
&& 'unstable'
6776
|| ''
68-
}}
77+
}}

.github/workflows/release_build_and_test.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ jobs:
2424
- name: Checkout code
2525
uses: actions/checkout@v4
2626

27+
- name: Parse vars
28+
id: parse
29+
uses: ./.github/actions/parse-env-file
30+
2731
- name: Validate Redis Release Archive
2832
uses: redis-developer/redis-oss-release-automation/.github/actions/validate-redis-release-archive@main
2933
with:
@@ -44,6 +48,11 @@ jobs:
4448
release_tag: ${{ github.event.inputs.release_tag }}
4549
release_version_branch: ${{ steps.ensure-branch.outputs.release_version_branch }}
4650
release_type: ${{ github.event.inputs.release_type }}
51+
outputs:
52+
BUILD_ARCHS: ${{ steps.parse.outputs.BUILD_ARCHS }}
53+
BUILD_DISTS: ${{ steps.parse.outputs.BUILD_DISTS }}
54+
BUILD_EXCLUDE: ${{ steps.parse.outputs.BUILD_EXCLUDE }}
55+
SMOKE_TEST_IMAGES: ${{ steps.parse.outputs.SMOKE_TEST_IMAGES }}
4756

4857
populate-env-vars:
4958
runs-on: ["ubuntu-latest"]
@@ -63,13 +72,12 @@ jobs:
6372
build-n-test:
6473
needs:
6574
- prepare-release
66-
- populate-env-vars
6775
uses: ./.github/workflows/build-n-test-all-distros.yml
6876
with:
69-
BUILD_DISTS: ${{ needs.populate-env-vars.outputs.BUILD_DISTS }}
70-
BUILD_ARCHS: ${{ needs.populate-env-vars.outputs.BUILD_ARCHS }}
71-
BUILD_EXCLUDE: ${{ needs.populate-env-vars.outputs.BUILD_EXCLUDE }}
72-
SMOKE_TEST_IMAGES: ${{ needs.populate-env-vars.outputs.SMOKE_TEST_IMAGES }}
77+
BUILD_DISTS: ${{ needs.prepare-release.outputs.BUILD_DISTS }}
78+
BUILD_ARCHS: ${{ needs.prepare-release.outputs.BUILD_ARCHS }}
79+
BUILD_EXCLUDE: ${{ needs.prepare-release.outputs.BUILD_EXCLUDE }}
80+
SMOKE_TEST_IMAGES: ${{ needs.prepare-release.outputs.SMOKE_TEST_IMAGES }}
7381
release_tag: ${{ inputs.release_tag }}
7482

7583
create-release-handle:

0 commit comments

Comments
 (0)