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

Sync develop to master #170

Merged
merged 13 commits into from
Apr 24, 2024
Merged

Sync develop to master #170

merged 13 commits into from
Apr 24, 2024

Conversation

paulbourelly999
Copy link
Contributor

PR Details

Description

This is an intermediate branch cut from master which includes fixes to the branch coupling of build and checkout scripts. This coupling can not yet be removed from CI processes because this repository still uses CircleCI. The functionality to decouple CI from branches is currently only available through our GitHub actions

Related GitHub Issue

Related Jira Key

Motivation and Context

Decouple build/checkout from branch to make release process simpler

How Has This Been Tested?

CI

Types of changes

  • Defect fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that cause existing functionality to change)

Checklist:

  • I have added any new packages to the sonar-scanner.properties file
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

SaikrishnaBairamoni and others added 11 commits February 9, 2024 14:25
<!-- Thanks for the contribution, this is awesome. -->

# PR Details
## Description
This PR is to remove steps to build and run unit test for the carma-msgs
repo. This already happens in carma-msgs repo CI and is not necessary
for generating sonar scanner report. **Update**: Removed entire circle
ci workflow since project does not require unit test code coverage it
can use [automatic
analysis](https://docs.sonarsource.com/sonarcloud/advanced-setup/automatic-analysis/?_gl=1*bpmykr*_gcl_aw*R0NMLjE3MDU0MjI3MDAuQ2p3S0NBaUE3NWl0QmhBNkVpd0FraG85ZTkyNGFDb2JVbjNKOHJJcWdzLUNZd2xsU1hVbGJaSnFlUFZybmYtZ0F0Z2hoRmNFcnVrQUZSb0NJOEVRQXZEX0J3RQ..*_gcl_au*MjAwNDcxNzU4Ny4xNzA5NzYyNjAz*_ga*MTc2NDc2NjYwNC4xNjc4MjAyNTQx*_ga_9JZ0GZ5TC6*MTcxMjkyODQ3Mi43MC4xLjE3MTI5Mjk1NDcuNjAuMC4w)
from sonar scanner. This does not require a CI process and instead just
runs static analysis on every PR and on every push to default branch
<!--- Describe your changes in detail -->

## Related GitHub Issue

<!--- This project only accepts pull requests related to open GitHub
issues or Jira Keys -->
<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Please DO NOT name partially fixed issues, instead open an issue
specific to this fix -->
<!--- Please link to the issue here: -->

## Related Jira Key

<!-- e.g. CAR-123 -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?

<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [ ] Defect fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that cause existing functionality
to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

- [ ] I have added any new packages to the sonar-scanner.properties file
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have read the
[**CONTRIBUTING**](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md)
document.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
<!-- Thanks for the contribution, this is awesome. -->

# PR Details
## Description
Waiting on PR #168 
<!--- Describe your changes in detail -->

## Related GitHub Issue

<!--- This project only accepts pull requests related to open GitHub
issues or Jira Keys -->
<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Please DO NOT name partially fixed issues, instead open an issue
specific to this fix -->
<!--- Please link to the issue here: -->

## Related Jira Key

<!-- e.g. CAR-123 -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?

<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [ ] Defect fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that cause existing functionality
to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

- [ ] I have added any new packages to the sonar-scanner.properties file
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have read the
[**CONTRIBUTING**](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md)
document.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
README.md Outdated
@@ -1,6 +1,6 @@
| Sonar Code Quality | DockerHub Release | DockerHub Release Candidate | DockerHub Develop |
|-----|-----|-----|-----|
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=usdot-fhwa-stol_carma-web-ui&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=usdot-fhwa-stol_carma-web-ui) | [![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/usdotfhwastol/carma-web-ui?label=Carma-Web-UI)](https://hub.docker.com/repository/docker/usdotfhwastol/carma-web-ui) | [![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/usdotfhwastolcandidate/carma-web-ui?label=Carma-Web-UI)](https://hub.docker.com/repository/docker/usdotfhwastolcandidate/carma-web-ui) | [![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/usdotfhwastoldev/carma-web-ui?label=Carma-Web-UI)](https://hub.docker.com/repository/docker/usdotfhwastoldev/carma-web-ui)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=usdot-fhwa-stol_carma-web-ui&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=usdot-fhwa-stol_carma-web-ui) | [![Docker Hub build](https://github.com/usdot-fhwa-stol/carma-web-ui/actions/workflows/dockerhub.yml/badge.svg?branch=carma-system-4.5.0)](https://github.com/usdot-fhwa-stol/carma-web-ui/actions/workflows/dockerhub.yml) | [![Docker Hub build](https://github.com/usdot-fhwa-stol/carma-web-ui/actions/workflows/dockerhub.yml/badge.svg?branch=release%2Flavida)](https://github.com/usdot-fhwa-stol/carma-web-ui/actions/workflows/dockerhub.yml) | [![Docker Hub build](https://github.com/usdot-fhwa-stol/carma-web-ui/actions/workflows/dockerhub.yml/badge.svg?branch=develop)](https://github.com/usdot-fhwa-stol/carma-web-ui/actions/workflows/dockerhub.yml)
Copy link
Contributor

@MishkaMN MishkaMN Apr 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we decided on removing the candidate and release badges and keep develop at least. I will leave it up to you if you want to keep master as well. master is essentially "carma-system" tagges ones anyways, so we can also omit in my opinion

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed

Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@paulbourelly999 paulbourelly999 merged commit 95e47e9 into develop Apr 24, 2024
2 checks passed
@paulbourelly999 paulbourelly999 deleted the sync-develop-to-master branch April 24, 2024 19:49
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.

5 participants