Skip to content

Add workflow to prevent accidentally merging fixup commits#459

Merged
dmitry-lyfar merged 1 commit into
mainfrom
chore/ban-fixup-commits
Aug 18, 2025
Merged

Add workflow to prevent accidentally merging fixup commits#459
dmitry-lyfar merged 1 commit into
mainfrom
chore/ban-fixup-commits

Conversation

@jonathan-conder
Copy link
Copy Markdown
Contributor

Description

I messed this up recently (canonical/sdkcraft#167) and don't think I can rely on remembering to do it every time.

Self-review quick check

  • Make decisions that cost a lot to reverse explicit in the PR description.
  • Avoid nested conditions.
  • Delete dead code and redundant comments.
  • Normalise symmetries by sticking to doing identical things identically.
// one way to handle errors
if err := f(); err != nil {
   ...
}

// one way to handle multiple returns
val, err := f()
if err != nil {
   ...
}
...
  • Check that coupled code elements, files, and directories are adjacent. For example, test data is stored as close as possible to a test.
  • Put variable declaration and initialisation together.
  • Divide large expressions into digestable and self-explanatory ones. Use multiple variables if required.
  • Put a blank line between two logically different chunks of code.
  • Follow the style guide for new error messages.

Docs

  • I have checked and added or updated relevant documentation.
  • I have checked and added or updated relevant release notes.
  • I have included the technical author in the review.

Or:

  • I confirm the PR has no implications for documentation.

@github-actions
Copy link
Copy Markdown

TICS Quality Gate

❌ Failed

The following errors have occurred during analysis:

❌ [ERROR 5333] Project database 'workshop' already is connected to a started TICSQServer process that has not registered a stop time. To avoid data corruption, analysis is aborted. Details of the other TICSQServer process: started at 2025-08-14 03:36:53.000 by user ubuntu.

Automatic-tests / code-coverage / TICS GitHub Action

@jonathan-conder jonathan-conder force-pushed the chore/ban-fixup-commits branch from f4c2d7b to 964a5b9 Compare August 17, 2025 22:54
@github-actions
Copy link
Copy Markdown

TICS Quality Gate

❌ Failed

The following errors have occurred during analysis:

❌ [ERROR 5333] Project database 'workshop' already is connected to a started TICSQServer process that has not registered a stop time. To avoid data corruption, analysis is aborted. Details of the other TICSQServer process: started at 2025-08-14 03:36:53.000 by user ubuntu.

Automatic-tests / code-coverage / TICS GitHub Action

@dmitry-lyfar dmitry-lyfar merged commit 7bf3bb6 into main Aug 18, 2025
10 of 11 checks passed
@dmitry-lyfar dmitry-lyfar deleted the chore/ban-fixup-commits branch August 18, 2025 01:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants