Skip to content

Commit aada60e

Browse files
authored
Merge pull request #40 from redis/release_automation
Fix publish flow
2 parents 9b338dc + fff1e46 commit aada60e

File tree

3 files changed

+26
-6
lines changed

3 files changed

+26
-6
lines changed

.github/actions/common/edit-cask.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ edit_cask_file(){
7575
# Update sha256 values in cask file
7676
if [ -n "$arm_sha" ] && [ -n "$intel_sha" ]; then
7777
# Replace existing sha256 line with new values
78-
sed -i '' "s/sha256 arm: \"[^\"]*\",$/sha256 arm: \"$arm_sha\",/" $casks_path
79-
sed -i '' "/sha256 arm:/,/intel:/ s/intel: \"[^\"]*\"/intel: \"$intel_sha\"/" "$casks_path"
78+
sed -i "s/sha256 arm: \"[^\"]*\",$/sha256 arm: \"$arm_sha\",/" $casks_path
79+
sed -i "/sha256 arm:/,/intel:/ s/intel: \"[^\"]*\"/intel: \"$intel_sha\"/" "$casks_path"
8080
else
8181
echo "Error: Missing sha256 values in package_json"
8282
exit 1
@@ -88,7 +88,7 @@ edit_cask_file(){
8888
fi
8989

9090
# Change version
91-
sed -i '' "s/version \"[^\"]*\"/version \"$tag\"/" $casks_path
91+
sed -i "s/version \"[^\"]*\"/version \"$tag\"/" $casks_path
9292
}
9393

9494
# Parse command line arguments

.github/actions/upload-packages/action.yml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ inputs:
1111
release_tag:
1212
description: 'Release tag to publish'
1313
required: true
14+
release_version_branch:
15+
description: 'Release version changes'
16+
required: true
1417
gh_token:
1518
description: "GitHub token"
1619
required: true
@@ -94,11 +97,27 @@ runs:
9497
echo "EOF" >> $GITHUB_OUTPUT
9598
9699
- name: Edit cask file
100+
id: edit-cask-file
97101
shell: bash
98102
run: |
99103
if [ "${{ inputs.channel }}" == "stable" ]; then
100104
${{ github.action_path }}/../common/edit-cask.sh --cask redis --action publish --package-json "$packages_sha256_json" ${{ inputs.release_tag }}
101-
${{ github.action_path }}/../common/edit-cask.sh --cask redis-rc --action publish --package-json "$packages_sha256_json" ${{ inputs.release_tag }}
102-
elif [ "${{ inputs.channel }}" == "rc" ]; then
103-
${{ github.action_path }}/../common/edit-cask.sh --cask redis-rc --action publish --package-json "$packages_sha256_json" ${{ inputs.release_tag }}
104105
fi
106+
${{ github.action_path }}/../common/edit-cask.sh --cask redis-rc --action publish --package-json "$packages_sha256_json" ${{ inputs.release_tag }}
107+
# Check what files actually changed in git
108+
changed_files=$(git diff --name-only Casks/)
109+
if [ -n "$changed_files" ]; then
110+
echo "changed_files<<EOF" >> "$GITHUB_ENV"
111+
echo "$changed_files" >> "$GITHUB_ENV"
112+
echo "EOF" >> "$GITHUB_ENV"
113+
else
114+
echo "changed_files=" >> "$GITHUB_ENV"
115+
fi
116+
117+
- name: Create verified commit
118+
if: ${{ env.changed_files }} != ''
119+
uses: iarekylew00t/verified-bot-commit@v1
120+
with:
121+
message: ${{ inputs.release_tag }}
122+
files: ${{ env.changed_files }}
123+
ref: ${{ inputs.release_version_branch }}

.github/workflows/release_publish.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ jobs:
7373
run_id: ${{ steps.parse-handle.outputs.run_id }}
7474
release_type: ${{ github.event.inputs.release_type }}
7575
release_tag: ${{ github.event.inputs.release_tag }}
76+
release_version_branch: ${{ steps.ensure-branch.outputs.release_version_branch }}
7677
gh_token: ${{ secrets.GITHUB_TOKEN }}
7778
channel: ${{ inputs.channel }}
7879
BREW_S3_REGION: ${{ github.event.inputs.release_type == 'public' && secrets.S3_REGION || secrets.S3_REGION_STAGING }}

0 commit comments

Comments
 (0)