Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use rhobs actions #85

Merged
merged 1 commit into from
Jul 16, 2024
Merged

use rhobs actions #85

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/merge-acm-flow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
echo "release=${UPSTREAM_VERSION}" >> "$GITHUB_OUTPUT"
- name: Find github org name from repo name
id: org
run: |

Check failure on line 84 in .github/workflows/merge-acm-flow.yaml

View workflow job for this annotation

GitHub Actions / actionlint 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2129:style:1:1: Consider using { cmd1; cmd2; } >> file instead of individual redirects [shellcheck]

Raw Output:
.github/workflows/merge-acm-flow.yaml:84:9: shellcheck reported issue in this script: SC2129:style:1:1: Consider using { cmd1; cmd2; } >> file instead of individual redirects [shellcheck]

Check failure on line 84 in .github/workflows/merge-acm-flow.yaml

View workflow job for this annotation

GitHub Actions / actionlint 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2086:info:1:54: Double quote to prevent globbing and word splitting [shellcheck]

Raw Output:
.github/workflows/merge-acm-flow.yaml:84:9: shellcheck reported issue in this script: SC2086:info:1:54: Double quote to prevent globbing and word splitting [shellcheck]

Check failure on line 84 in .github/workflows/merge-acm-flow.yaml

View workflow job for this annotation

GitHub Actions / actionlint 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2086:info:2:58: Double quote to prevent globbing and word splitting [shellcheck]

Raw Output:
.github/workflows/merge-acm-flow.yaml:84:9: shellcheck reported issue in this script: SC2086:info:2:58: Double quote to prevent globbing and word splitting [shellcheck]

Check failure on line 84 in .github/workflows/merge-acm-flow.yaml

View workflow job for this annotation

GitHub Actions / actionlint 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2086:info:3:52: Double quote to prevent globbing and word splitting [shellcheck]

Raw Output:
.github/workflows/merge-acm-flow.yaml:84:9: shellcheck reported issue in this script: SC2086:info:3:52: Double quote to prevent globbing and word splitting [shellcheck]

Check failure on line 84 in .github/workflows/merge-acm-flow.yaml

View workflow job for this annotation

GitHub Actions / actionlint 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2086:info:20:52: Double quote to prevent globbing and word splitting [shellcheck]

Raw Output:
.github/workflows/merge-acm-flow.yaml:84:9: shellcheck reported issue in this script: SC2086:info:20:52: Double quote to prevent globbing and word splitting [shellcheck]
echo "upstream=$(dirname ${{ inputs.upstream }})" >> $GITHUB_OUTPUT
echo "downstream=$(dirname ${{ inputs.downstream }})" >> $GITHUB_OUTPUT
echo "sandbox=$(dirname ${{ inputs.sandbox }})" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -110,7 +110,7 @@
lenient: false # fail if either of the versions cannot be parsed
- name: Check openshift fork status
id: fork-sync
run: |

Check failure on line 113 in .github/workflows/merge-acm-flow.yaml

View workflow job for this annotation

GitHub Actions / actionlint 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2086:info:4:29: Double quote to prevent globbing and word splitting [shellcheck]

Raw Output:
.github/workflows/merge-acm-flow.yaml:113:9: shellcheck reported issue in this script: SC2086:info:4:29: Double quote to prevent globbing and word splitting [shellcheck]

Check failure on line 113 in .github/workflows/merge-acm-flow.yaml

View workflow job for this annotation

GitHub Actions / actionlint 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2086:info:7:29: Double quote to prevent globbing and word splitting [shellcheck]

Raw Output:
.github/workflows/merge-acm-flow.yaml:113:9: shellcheck reported issue in this script: SC2086:info:7:29: Double quote to prevent globbing and word splitting [shellcheck]

Check failure on line 113 in .github/workflows/merge-acm-flow.yaml

View workflow job for this annotation

GitHub Actions / actionlint 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2086:info:11:26: Double quote to prevent globbing and word splitting [shellcheck]

Raw Output:
.github/workflows/merge-acm-flow.yaml:113:9: shellcheck reported issue in this script: SC2086:info:11:26: Double quote to prevent globbing and word splitting [shellcheck]
SEMVER_RESULT="${{ steps.version.outputs.comparison-result }}"
echo "${{ inputs.downstream }}@${{ steps.org.outputs.downstream-version }} ${SEMVER_RESULT} ${{ inputs.upstream }}@${{ steps.upstream.outputs.release }}"
if [ "${SEMVER_RESULT}" == "<" ]; then
Expand Down Expand Up @@ -138,7 +138,7 @@
git fetch https://github.com/${{ inputs.upstream }} --tags
- name: Merge with upstream ${{ steps.upstream.outputs.release }} tag
id: merge
run: |

Check failure on line 141 in .github/workflows/merge-acm-flow.yaml

View workflow job for this annotation

GitHub Actions / actionlint 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2086:info:1:112: Double quote to prevent globbing and word splitting [shellcheck]

Raw Output:
.github/workflows/merge-acm-flow.yaml:141:9: shellcheck reported issue in this script: SC2086:info:1:112: Double quote to prevent globbing and word splitting [shellcheck]
git merge -X theirs refs/tags/${{ steps.upstream.outputs.release }} --no-edit || echo 'MERGE_CONFLICT=true' >> $GITHUB_OUTPUT
- name: Resolve conflict using upstream contents
if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' && inputs.restore-upstream != ''}}
Expand Down Expand Up @@ -211,7 +211,7 @@
scope: ${{ steps.org.outputs.sandbox }}
- name: Create Pull Request
if: github.event_name != 'pull_request'
uses: peter-evans/create-pull-request@v6
uses: rhobs/create-pull-request@v3
id: create-pr
with:
title: "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}"
Expand Down Expand Up @@ -244,6 +244,7 @@
delete-branch: true
token: ${{ steps.pr.outputs.token }}
push-to-fork: ${{ inputs.sandbox }}
push-to-fork-token: ${{ steps.cloner.outputs.token }}
- name: Compose slack message body
if: github.event_name != 'pull_request' && (success() || steps.fork-sync.outputs.status == 'uptodate' || steps.fork-sync.outputs.status == 'ahead')
continue-on-error: true
Expand Down
Loading