Skip to content

Run Prettybot's cleanup with the repo's profile #347

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

Merged
matt-richardson merged 1 commit into from
Aug 12, 2026
Merged

Run Prettybot's cleanup with the repo's profile #347

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
9 changes: 6 additions & 3 deletions .github/workflows/prettybot-automation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,13 @@ jobs:
username: ${{ secrets.INTERNAL_DOCKER_READ_ONLY_USER_NAME }}
password: ${{ secrets.INTERNAL_DOCKER_READ_ONLY_ACCESS_TOKEN }}
- name: Run Cleanup Code
# Invoked directly rather than via the container's /scripts/prettybot.sh, which runs
# cleanupcode without --profile and so silently applies ReSharper's built-in Full
# Cleanup instead of the profile defined in OctoVersion.sln.DotSettings.
# Make the workspace writable to github actions runner user
run: |
chmod -R a+w ${{ github.workspace }}
docker run -v ${{ github.workspace }}:/src ${{ secrets.INTERNAL_DOCKER_REGISTRY_URL }}/octopusdeploy/tool-containers/tool-resharper-cli:latest /scripts/prettybot.sh
docker run -v ${{ github.workspace }}:/src ${{ secrets.INTERNAL_DOCKER_REGISTRY_URL }}/octopusdeploy/tool-containers/tool-resharper-cli:latest -c 'cd /src/source && dotnet restore && jb cleanupcode OctoVersion.sln --profile="Octopus Deploy"'

- name: Git Check for file changes
id: git-check
Expand All @@ -65,8 +68,8 @@ jobs:
- name: Create Pull Request
if: steps.git-check.outputs.changed == 'true'
run: |
EXISTING_PRS=$(gh pr list --author "github-actions[bot]" --state open --head "prettybot" --json number --template '{{range .}}{{.number}}{{ "\n" }}{{end}}')
NEW_PR=$(gh pr create --base main --head ${{ env.BRANCH_NAME }} --title "Automated PR for Prettybot" --body "This is an automated PR.")
EXISTING_PRS=$(gh pr list --author "team-builds-bot" --state open --head "prettybot" --json number --template '{{range .}}{{.number}}{{ "\n" }}{{end}}')
NEW_PR=$(gh pr create --base main --head ${{ env.BRANCH_NAME }} --title "Automated PR for Prettybot" --body "This is an automated PR." --label autoapprove)
# close existing PRs
for pr in $EXISTING_PRS; do
gh pr close "$pr" --comment "Superseded by $NEW_PR." --delete-branch
Expand Down
Loading