Skip to content

Commit

Permalink
Merge release to develop for release 4.5.0 (#216)
Browse files Browse the repository at this point in the history
# PR Details
## Description
Merge PR to formalize release of master into develop as part of CARMA
release process for 4.5.0.

PR created automatically via CARMA release tool and Github CLI
## Motivation and Context

This PR brings the tested and reviewed contents of the master
release/candidate into develop for final release preparation

## How Has This Been Tested?

This release branch (minus final version number changes) has been tested
through the CARMA verification test plan.

## Checklist:
- [X] I have added any new packages to the sonar-scanner.properties file
- [X] My change requires a change to the documentation.
- [X] I have updated the documentation accordingly.
- [X] I have read the **CONTRIBUTING** document.
[CARMA Contributing
Guide](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md)
- [X] I have added tests to cover my changes.
- [X] All new and existing tests passed.
  • Loading branch information
MishkaMN authored Apr 24, 2024
2 parents b7c1977 + 0a2f83b commit f51f820
Show file tree
Hide file tree
Showing 12 changed files with 268 additions and 309 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ on:
pull_request:
types: [opened, synchronize, reopened]
push:
branches: [develop, master]
branches:
- develop
- master
- "release/*"
jobs:
sonar: # sonar job is to setup and run sonar scan analysis on telematic cloud messaging code
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ on:

jobs:
docker:
uses: usdot-fhwa-stol/actions/.github/workflows/docker.yml@main
uses: usdot-fhwa-stol/actions/.github/workflows/docker.yml@main
2 changes: 2 additions & 0 deletions .github/workflows/dockerhub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
- "develop"
- "master"
- "release/*"
tags:
- "carma-system-*"

jobs:
dockerhub:
Expand Down
Loading

0 comments on commit f51f820

Please sign in to comment.