Skip to content

Commit

Permalink
Merge release/miura (7.7.0) branch into master (#629)
Browse files Browse the repository at this point in the history
<!-- Thanks for the contribution, this is awesome. -->

# PR Details
This PR is to merge release/miura branch into master branch for XIL
Cloud release with new version.
## Description

<!--- Describe your changes in detail -->

## Related Issue

<!--- This project only accepts pull requests related to open issues -->
<!--- 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 link to the issue here: -->

## 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.
- [x] I have updated the documentation accordingly.
- [x] I have read the **CONTRIBUTING** document.
[V2XHUB Contributing
Guide](https://github.com/usdot-fhwa-OPS/V2X-Hub/blob/develop/Contributing.md)
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
  • Loading branch information
SaikrishnaBairamoni authored Aug 15, 2024
2 parents 9c30a8a + 4fae835 commit 657a30f
Show file tree
Hide file tree
Showing 1,424 changed files with 136,983 additions and 1,832 deletions.
109 changes: 0 additions & 109 deletions .circleci/config.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
// Docker Compose syntax from https://github.com/devcontainers/templates/blob/main/src/docker-existing-docker-compose/.devcontainer/devcontainer.json
// and https://github.com/microsoft/vscode-dev-containers/blob/main/container-templates/docker-compose/.devcontainer/devcontainer.json
"name": "V2XHUB Docker Compose Dev",
"name": "V2X Hub Docker Compose Dev",

// Update the 'dockerComposeFile' list if you have more compose files or use different names.
"dockerComposeFile": "docker-compose-vscode.yml",
Expand Down
6 changes: 2 additions & 4 deletions .devcontainer/docker-compose-vscode.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.3'

services:
v2xhub:
build:
Expand Down Expand Up @@ -31,7 +29,7 @@ services:
- mysql_password

db:
image: mysql:5.7
image: mysql:8.0
container_name: mysql
restart: always
environment:
Expand All @@ -44,7 +42,7 @@ services:
- mysql_password
- mysql_root_password
volumes:
- ../configuration/amd64/mysql/localhost.sql:/docker-entrypoint-initdb.d/localhost.sql
- ../configuration/mysql/localhost.sql:/docker-entrypoint-initdb.d/localhost.sql
# include creation of a user (user/user) to be able to log in
- ./mysql_add_dev_user.sql:/docker-entrypoint-initdb.d/mysql_add_dev_user.sql
- mysql-datavolume:/var/lib/mysql
Expand Down
106 changes: 0 additions & 106 deletions .github/workflows/build.yml

This file was deleted.

48 changes: 48 additions & 0 deletions .github/workflows/build_php_docker_image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Build PHP V2X-Hub Web UI
on:
push:
branches:
- develop
- master
- 'release/**'
# Build all tags not containing a / (https://stackoverflow.com/questions/61891328/trigger-github-action-only-on-new-tags )
tags:
- '*'
jobs:
v2xhub-docker:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: usdotfhwaops/php
tags: |
type=schedule
type=ref,event=branch
type=ref,event=tag
type=ref,event=pr
# set latest tag for default branch
type=raw,value=latest,enable={{is_default_branch}}
- name: Build and push
uses: docker/build-push-action@v5
with:
push: true
platforms: linux/amd64,linux/arm64
file: ./docker/Dockerfile-php
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
BUILD_ARCHITECTURE=${{ matrix.architecture }}
UBUNTU_CODENAME=${{ matrix.ubuntu-codename }}
48 changes: 48 additions & 0 deletions .github/workflows/build_port_drayage_docker_image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Build Port Drayage Web Service
on:
push:
branches:
- develop
- master
- 'release/**'
# Build all tags not containing a / (https://stackoverflow.com/questions/61891328/trigger-github-action-only-on-new-tags )
tags:
- '*'
jobs:
v2xhub-docker:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: usdotfhwaops/port-drayage-webservice
tags: |
type=schedule
type=ref,event=branch
type=ref,event=tag
type=ref,event=pr
# set latest tag for default branch
type=raw,value=latest,enable={{is_default_branch}}
- name: Build and push
uses: docker/build-push-action@v5
with:
push: true
platforms: linux/amd64,linux/arm64
context: ./tools/port-drayage-webservice/
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
BUILD_ARCHITECTURE=${{ matrix.architecture }}
UBUNTU_CODENAME=${{ matrix.ubuntu-codename }}
47 changes: 47 additions & 0 deletions .github/workflows/build_v2xhub_docker_image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Build V2X-Hub Docker Image
on:
push:
branches:
- develop
- master
- 'release/**'
# Build all tags not containing a / (https://stackoverflow.com/questions/61891328/trigger-github-action-only-on-new-tags )
tags:
- '*'
jobs:
v2xhub-docker:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: usdotfhwaops/v2xhub
tags: |
type=schedule
type=ref,event=branch
type=ref,event=tag
type=ref,event=pr
# set latest tag for default branch
type=raw,value=latest,enable={{is_default_branch}}
- name: Build and push
uses: docker/build-push-action@v5
with:
push: true
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
BUILD_ARCHITECTURE=${{ matrix.architecture }}
UBUNTU_CODENAME=${{ matrix.ubuntu-codename }}
Loading

0 comments on commit 657a30f

Please sign in to comment.