Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitbugtraq
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# An example content of .gitbugtraq to put in the repository root directory.
# It could instead be added as an additional section to $GIT_DIR/config.
# (note that '\' need to be escaped).

[bugtraq]
url = https://github.com/LieberLieber/LemonTree.DevOps.Demo/issues/%BUGID%
loglinkregex = "#\\d+"
Expand Down
17 changes: 17 additions & 0 deletions .github/pr-instructions.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@

---

## 🔄 Rebase Instructions

If you need to rebase this PR against the target branch, you can trigger the automated rebase workflow by commenting:

```
/rebase/
```

The rebase workflow will automatically:
- Rebase your PR branch against the target branch
- Resolve model conflicts using LemonTree.Automation
- Push the rebased changes

**Note:** Only authorized contributors can trigger this workflow.
34 changes: 18 additions & 16 deletions .github/workflows/AddRebaseInstructionsOnPROpen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,26 @@ jobs:
add_instructions:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Add rebase instructions to PR body
uses: actions/github-script@v8
with:
script: |
const instructions = `

---

## 🔄 Rebase Instructions

If you need to rebase this PR against the target branch, you can trigger the automated rebase workflow by commenting:

/rebase/

The rebase workflow will automatically:
- Rebase your PR branch against the target branch
- Resolve model conflicts using LemonTree.Automation
- Push the rebased changes

**Note:** Only authorized contributors can trigger this workflow.`;
const fs = require('fs');
const path = require('path');

// Read instructions from file
const instructionsFile = path.join(process.env.GITHUB_WORKSPACE, '.github/pr-instructions.md');

let instructions = '';
if (fs.existsSync(instructionsFile)) {
instructions = fs.readFileSync(instructionsFile, 'utf8');
console.log('Read instructions from file');
} else {
console.log('Instructions file not found, skipping AppendBody');
return;
}

// Get current PR
const pr = await github.rest.pulls.get({
Expand All @@ -54,3 +54,5 @@ The rebase workflow will automatically:
pull_number: context.issue.number,
body: newBody
});

console.log('Successfully updated PR body with instructions');