references/openproject
1
0
Fork 0
mirror of https://github.com/opf/openproject.git synced 2026-06-14 03:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into rails-7.2

Browse Source
This commit is contained in:
ulferts
2025-02-27 17:48:20 +01:00
parent d7962acf1f eae6ee18b1
commit d91de29d7c
5049 changed files with 125904 additions and 33760 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/github_pr_errors
+4 -8
View File
@@ -564,14 +564,10 @@ class Formatter
def display_checkout_test_commit_information(report)
if report.merge_branch_sha
warn <<~INSTRUCTIONS.white.dark
To be with the exact same source files as CI, use these commands:
git branch --force repro/head_branch #{report.head_sha}
git branch --force repro/merge_branch #{report.merge_branch_sha}
git checkout repro/merge_branch
git merge --no-commit --no-verify repro/head_branch
git checkout --detach
git branch --delete repro/head_branch
git branch --delete repro/merge_branch
GitHub Action run merged #{report.merge_branch_sha} into #{report.head_sha} before running.
To be with the exact same source files as CI, use these commands (warning: stash your modifications first):
git checkout --force -b repro_ci_failures #{report.head_sha}
git merge --no-edit --no-verify #{report.merge_branch_sha}
INSTRUCTIONS
else
warn <<~INSTRUCTIONS.white.dark