forked from microsoft/onnxruntime
-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
PRをgit merge --ff-only
できるようにする
#1
Draft
qryxip
wants to merge
6
commits into
VOICEVOX:main
Choose a base branch
from
qryxip:ff-merge-action
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
6ea9fa0
PRを`git merge --ff-only`できるようにする
qryxip 62739d4
`ubuntu-latest`を使う
qryxip 6b8ff38
Merge remote-tracking branch 'VOICEVOX/main' into ff-merge-action
qryxip 58d90d3
ff-merge.ymlにコメント
qryxip 30d8481
pull request templateにチェックボックスを追加
qryxip a1fa004
コメントを更新
qryxip File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
# PRに`ff-merge`というラベルを付けると、このworkflowが起動して`--ff-only`なマージが行われる。 | ||
# | ||
# microsoft/onnxruntimeの変更を、CIのチェックとレビューを通し、かつ単純なコミットログの状態で取り込むことが目的。 | ||
# microsoft/onnxruntimeのブランチ/タグを`git merge`したものをPRとして出し、それをこのworkflowで対象ブランチに取り込む。 | ||
|
||
name: FF merge | ||
on: | ||
pull_request: | ||
types: | ||
- labeled | ||
|
||
jobs: | ||
merge-upstream: | ||
runs-on: ubuntu-latest | ||
if: github.event.label.name == 'ff-merge' | ||
|
||
steps: | ||
- uses: actions/checkout@v3 | ||
with: | ||
ref: main | ||
submodules: true | ||
|
||
- name: FF merge | ||
shell: bash | ||
run: | | ||
# https://github.com/robotology/gh-action-nightly-merge/pull/13 | ||
git config --global --add safe.directory "$GITHUB_WORKSPACE" | ||
|
||
git remote add target "https://x-access-token:${GITHUB_TOKEN}@github.com/$GITHUB_REPOSITORY.git" | ||
|
||
git fetch origin ${{ github.event.pull_request.head.sha }} | ||
git merge --ff-only ${{ github.event.pull_request.head.sha }} | ||
git push target main | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
参考にしたgh-action-nightly-mergeのドキュメントに気になる一言がありました。
https://github.com/robotology/gh-action-nightly-merge#push_token
personal tokenを発行すればbranch protectionを貫通できるということ...?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
リポジトリの管理者 or チームにBypass branch protection権限がある人はブランチ保護を無視できたはず…?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
最高の権限があったとしても手元から
git push origin main
したら怒られたと思うので、それが謎でした。このURLではそうではないということですかね...