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.

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

Sync develop to master #170

Merged
merged 13 commits into from
Apr 24, 2024
Merged

Sync develop to master #170

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b197de9
update config to point candidate image
SaikrishnaBairamoni Feb 9, 2024
aff0ade
Update config.yml
maefromm Apr 9, 2024
acd566f
Remove steps to build/test carma_msgs repo from CI.
paulbourelly999 Apr 12, 2024
619a167
Update sonar scanner properties
paulbourelly999 Apr 12, 2024
952b2d7
Automatic sonar scan is setup so circle ci process is not needed at all
paulbourelly999 Apr 12, 2024
f7b835c
Update badges on readme to reflect CI changes
paulbourelly999 Apr 12, 2024
91cd20e
Updates
paulbourelly999 Apr 12, 2024
2f7f6d9
Remove redundant/conflicting properties
paulbourelly999 Apr 12, 2024
5e46e75
Remove steps to build/test carma_msgs repo from CI. (#168)
dan-du-car Apr 12, 2024
383da4a
Merge Release/lavida to Master (4.5.0) (#166)
MishkaMN Apr 12, 2024
4caa9cd
Add GitHub action for docker builds
paulbourelly999 Apr 24, 2024
272a537
Update README
paulbourelly999 Apr 24, 2024
14fd894
Update README
paulbourelly999 Apr 24, 2024
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
95 changes: 0 additions & 95 deletions .circleci/config.yml
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: Docker build

on:
pull_request:
types: [opened, synchronize, reopened]
jobs:
docker:
uses: usdot-fhwa-stol/actions/.github/workflows/docker.yml@main
16 changes: 16 additions & 0 deletions .github/workflows/dockerhub.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Docker Hub build

on:
push:
branches:
- develop
- master
- "release/*"
tags:
- "carma-system-*"
jobs:
dockerhub:
uses: usdot-fhwa-stol/actions/.github/workflows/dockerhub.yml@main
secrets:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
8 changes: 4 additions & 4 deletions .sonarqube/sonar-scanner.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@

# Configuration file for Sonar Scanner used for CI

sonar.projectKey=usdot-fhwa-stol_CARMAWebUi
sonar.projectKey=usdot-fhwa-stol_carma-web-ui
sonar.organization=usdot-fhwa-stol
sonar.cfamily.cache.enabled=false
sonar.cfamily.compile-commands=/opt/carma/build/compile_commands.json
sonar.host.url=https://sonarcloud.io
sonar.sources=website/scripts/, website/utils
sonar.sources=website/
sonar.exclusions=website/thirdparty/

# Set Git as SCM sensor
sonar.scm.disabled=false
sonar.scm.enabled=true
sonar.scm.provider=git
sonar.exclusions=website/scripts/*
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
| CicleCI Build Status | Sonar Code Quality | DockerHub Release | DockerHub Release Candidate | DockerHub Develop |
|------|-----|-----|-----|-----|
[![CircleCI](https://img.shields.io/circleci/build/gh/usdot-fhwa-stol/carma-web-ui/develop?label=CircleCI)](https://app.circleci.com/pipelines/github/usdot-fhwa-stol/carma-web-ui?branch=develop) | [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=usdot-fhwa-stol_CARMAWebUi&metric=alert_status)](https://sonarcloud.io/dashboard?id=usdot-fhwa-stol_CARMAWebUi) | [![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)
| 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 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 •
edited
Loading

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


# CARMAWebUi
CARMAWebUi is the web-based user interface component of the CARMAPlatform.
Expand Down