Skip to content

Commit dacc013

Browse files
authored
Merge pull request #72 from redis/unstable_fix_checkout_2
Fix checkout in unstable branch
2 parents 480d8ee + 78a790e commit dacc013

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
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/release_build_and_test.yml

Lines changed: 8 additions & 15 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,16 +48,6 @@ 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 }}
47-
48-
populate-env-vars:
49-
runs-on: ["ubuntu-latest"]
50-
steps:
51-
- name: Checkout code
52-
uses: actions/checkout@v4
53-
54-
- name: Parse vars
55-
id: parse
56-
uses: ./.github/actions/parse-env-file
5751
outputs:
5852
BUILD_ARCHS: ${{ steps.parse.outputs.BUILD_ARCHS }}
5953
BUILD_DISTS: ${{ steps.parse.outputs.BUILD_DISTS }}
@@ -63,13 +57,12 @@ jobs:
6357
build-n-test:
6458
needs:
6559
- prepare-release
66-
- populate-env-vars
6760
uses: ./.github/workflows/build-n-test-all-distros.yml
6861
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 }}
62+
BUILD_DISTS: ${{ needs.prepare-release.outputs.BUILD_DISTS }}
63+
BUILD_ARCHS: ${{ needs.prepare-release.outputs.BUILD_ARCHS }}
64+
BUILD_EXCLUDE: ${{ needs.prepare-release.outputs.BUILD_EXCLUDE }}
65+
SMOKE_TEST_IMAGES: ${{ needs.prepare-release.outputs.SMOKE_TEST_IMAGES }}
7366
release_tag: ${{ inputs.release_tag }}
7467

7568
create-release-handle:

0 commit comments

Comments
 (0)