diff --git a/.github/actions/common/edit-cask.sh b/.github/actions/common/edit-cask.sh index 065c357..e19a848 100755 --- a/.github/actions/common/edit-cask.sh +++ b/.github/actions/common/edit-cask.sh @@ -75,8 +75,8 @@ edit_cask_file(){ # Update sha256 values in cask file if [ -n "$arm_sha" ] && [ -n "$intel_sha" ]; then # Replace existing sha256 line with new values - sed -i '' "s/sha256 arm: \"[^\"]*\",$/sha256 arm: \"$arm_sha\",/" $casks_path - sed -i '' "/sha256 arm:/,/intel:/ s/intel: \"[^\"]*\"/intel: \"$intel_sha\"/" "$casks_path" + sed -i "s/sha256 arm: \"[^\"]*\",$/sha256 arm: \"$arm_sha\",/" $casks_path + sed -i "/sha256 arm:/,/intel:/ s/intel: \"[^\"]*\"/intel: \"$intel_sha\"/" "$casks_path" else echo "Error: Missing sha256 values in package_json" exit 1 @@ -88,7 +88,7 @@ edit_cask_file(){ fi # Change version - sed -i '' "s/version \"[^\"]*\"/version \"$tag\"/" $casks_path + sed -i "s/version \"[^\"]*\"/version \"$tag\"/" $casks_path } # Parse command line arguments diff --git a/.github/actions/upload-packages/action.yml b/.github/actions/upload-packages/action.yml index d928915..a1db669 100644 --- a/.github/actions/upload-packages/action.yml +++ b/.github/actions/upload-packages/action.yml @@ -11,6 +11,9 @@ inputs: release_tag: description: 'Release tag to publish' required: true + release_version_branch: + description: 'Release version changes' + required: true gh_token: description: "GitHub token" required: true @@ -94,11 +97,27 @@ runs: echo "EOF" >> $GITHUB_OUTPUT - name: Edit cask file + id: edit-cask-file shell: bash run: | if [ "${{ inputs.channel }}" == "stable" ]; then ${{ github.action_path }}/../common/edit-cask.sh --cask redis --action publish --package-json "$packages_sha256_json" ${{ inputs.release_tag }} - ${{ github.action_path }}/../common/edit-cask.sh --cask redis-rc --action publish --package-json "$packages_sha256_json" ${{ inputs.release_tag }} - elif [ "${{ inputs.channel }}" == "rc" ]; then - ${{ github.action_path }}/../common/edit-cask.sh --cask redis-rc --action publish --package-json "$packages_sha256_json" ${{ inputs.release_tag }} fi + ${{ github.action_path }}/../common/edit-cask.sh --cask redis-rc --action publish --package-json "$packages_sha256_json" ${{ inputs.release_tag }} + # Check what files actually changed in git + changed_files=$(git diff --name-only Casks/) + if [ -n "$changed_files" ]; then + echo "changed_files<> "$GITHUB_ENV" + echo "$changed_files" >> "$GITHUB_ENV" + echo "EOF" >> "$GITHUB_ENV" + else + echo "changed_files=" >> "$GITHUB_ENV" + fi + + - name: Create verified commit + if: ${{ env.changed_files }} != '' + uses: iarekylew00t/verified-bot-commit@v1 + with: + message: ${{ inputs.release_tag }} + files: ${{ env.changed_files }} + ref: ${{ inputs.release_version_branch }} diff --git a/.github/workflows/release_publish.yml b/.github/workflows/release_publish.yml index 3bcb98e..394af0f 100644 --- a/.github/workflows/release_publish.yml +++ b/.github/workflows/release_publish.yml @@ -73,6 +73,7 @@ jobs: run_id: ${{ steps.parse-handle.outputs.run_id }} release_type: ${{ github.event.inputs.release_type }} release_tag: ${{ github.event.inputs.release_tag }} + release_version_branch: ${{ steps.ensure-branch.outputs.release_version_branch }} gh_token: ${{ secrets.GITHUB_TOKEN }} channel: ${{ inputs.channel }} BREW_S3_REGION: ${{ github.event.inputs.release_type == 'public' && secrets.S3_REGION || secrets.S3_REGION_STAGING }}