Skip to content
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

Feature #366 main_v2.1 sonarqube gha #368

Merged
merged 6 commits into from
Apr 8, 2024

Conversation

JohnHalleyGotway
Copy link
Contributor

@JohnHalleyGotway JohnHalleyGotway commented Apr 5, 2024

Same set of changes from PR #367, but these are for the main_v2.1 branch. I'm updating the main_v2.1 branch to make the SonarQube workflow dispatch option available and also to update the PR template to include the reminder about checking the SonarQube status during PR reviews.

FYI, I was easily able to apply the exact same changes for the main_v2.1 using the git cherry-pick command.

In my feature_366_develop_sonarqube_gha I ran git log -v to see my history of commits... with the commit message and commit hash. On my new feature_366_main_v2.1_sonarqube_gha branch, I ran the following command:

git cherry-pick \
  c543737bcca77371133e64e9b8eb5920a70c30b5 \
  ca2dfba9e78a29385baaa27e7e3ad2b023f7750a \
  86584e09c209db65a70d943bd7a4940cba312a07 \
  cbf219a5d3261cadf886b29787783f52ace831e2 \
  742a5ba951ce7be50c808b800ff1b9db488fe4b8

That applied all the changes across those 5 commit hashes to my new branch and was much faster and less error-prone that making the same commits manually.

Although, since I'm paranoid, I ran the following commands to make sure there were no unexpected changes:

# On feature_366_develop_sonarqube_gha
git diff origin/develop > develop_diffs
# On feature_366_main_v2.1_sonarqube_gha
git diff origin/main_v2.1 > main_diffs
diff develop_diffs main_diffs

And the set of diffs were identical.

@bikegeek bikegeek merged commit 79c4c8a into main_v2.1 Apr 8, 2024
7 checks passed
@bikegeek bikegeek deleted the feature_366_main_v2.1_sonarqube_gha branch April 8, 2024 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

Add GitHub action to run SonarQube for METcalcpy pull requests and feature branches
2 participants