From 96345787a75a3204a68e7f339b2f476cc36a3687 Mon Sep 17 00:00:00 2001 From: dan-du-car Date: Tue, 17 May 2022 19:01:20 -0400 Subject: [PATCH 1/6] init --- src/tmx/Asn_J2735/src/r63/TestMessage00.c | 3 +-- src/tmx/Asn_J2735/src/r63/TestMessage01.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/tmx/Asn_J2735/src/r63/TestMessage00.c b/src/tmx/Asn_J2735/src/r63/TestMessage00.c index 965fc4280..ffeadc578 100644 --- a/src/tmx/Asn_J2735/src/r63/TestMessage00.c +++ b/src/tmx/Asn_J2735/src/r63/TestMessage00.c @@ -27,7 +27,6 @@ asn_TYPE_member_t asn_MBR_TestMessage00_1[] = { "body" }, }; -static const int asn_MAP_TestMessage00_oms_1[] = { 0, 1 }; static const ber_tlv_tag_t asn_DEF_TestMessage00_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; @@ -40,7 +39,7 @@ asn_SEQUENCE_specifics_t asn_SPC_TestMessage00_specs_1 = { offsetof(struct TestMessage00, _asn_ctx), asn_MAP_TestMessage00_tag2el_1, 2, /* Count of tags in the map */ - asn_MAP_TestMessage00_oms_1, /* Optional members */ + 0, 0, 0, /* Optional elements (not needed) */ 2, 0, /* Root/Additions */ 2, /* First extension addition */ }; diff --git a/src/tmx/Asn_J2735/src/r63/TestMessage01.c b/src/tmx/Asn_J2735/src/r63/TestMessage01.c index 3c5aba819..6d60abebd 100644 --- a/src/tmx/Asn_J2735/src/r63/TestMessage01.c +++ b/src/tmx/Asn_J2735/src/r63/TestMessage01.c @@ -27,7 +27,6 @@ asn_TYPE_member_t asn_MBR_TestMessage01_1[] = { "body" }, }; -static const int asn_MAP_TestMessage01_oms_1[] = { 0, 1 }; static const ber_tlv_tag_t asn_DEF_TestMessage01_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; @@ -40,7 +39,7 @@ asn_SEQUENCE_specifics_t asn_SPC_TestMessage01_specs_1 = { offsetof(struct TestMessage01, _asn_ctx), asn_MAP_TestMessage01_tag2el_1, 2, /* Count of tags in the map */ - asn_MAP_TestMessage01_oms_1, /* Optional members */ + 0, 0, 0, /* Optional elements (not needed) */ 2, 0, /* Root/Additions */ 2, /* First extension addition */ }; From 96d790072197f759dd2ba2f8affb4dd8e274d2da Mon Sep 17 00:00:00 2001 From: paulbourelly999 <77466294+paulbourelly999@users.noreply.github.com> Date: Thu, 12 May 2022 14:50:02 -0400 Subject: [PATCH 2/6] Issue-369:Added automated release image push (#370) --- .circleci/config.yml | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index d90ebb815..225d7bcf0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -207,6 +207,40 @@ jobs: docker push usdotfhwaops/v2xhubarm:latest docker push usdotfhwaops/port-drayage-webservice_arm:latest docker push usdotfhwaops/php_arm:latest + automated_release : + machine: + image: ubuntu-2004:202201-02 + steps: + - run: + name: Docker Pull Release + # Pull all built images associated with github tag + command: | + docker pull usdotfhwaops/php:master + docker pull usdotfhwaops/port-drayage-webservice:master + docker pull usdotfhwaops/v2xhubamd:master + docker pull usdotfhwaops/php_arm:master + docker pull usdotfhwaops/port-drayage-webservice_arm:master + docker pull usdotfhwaops/v2xhubarm:master + - run: + name: Docker Tag Release + # Tag all pulled images with github tag name + command: | + docker tag usdotfhwaops/php:master usdotfhwaops/php:${CIRCLE_TAG} + docker tag usdotfhwaops/port-drayage-webservice:master usdotfhwaops/port-drayage-webservice:${CIRCLE_TAG} + docker tag usdotfhwaops/v2xhubamd:master usdotfhwaops/v2xhubamd:${CIRCLE_TAG} + docker tag usdotfhwaops/php_arm:master usdotfhwaops/php_arm:${CIRCLE_TAG} + docker tag usdotfhwaops/port-drayage-webservice_arm:master usdotfhwaops/port-drayage-webservice_arm:${CIRCLE_TAG} + docker tag usdotfhwaops/v2xhubarm:master usdotfhwaops/v2xhubarm:${CIRCLE_TAG} + - run: + name: Docker Push Release Tag + # Push all tagged images + command: | + docker push usdotfhwaops/php:${CIRCLE_TAG} + docker push usdotfhwaops/port-drayage-webservice:${CIRCLE_TAG} + docker push usdotfhwaops/v2xhubamd:${CIRCLE_TAG} + docker push usdotfhwaops/php_arm:${CIRCLE_TAG} + docker push usdotfhwaops/port-drayage-webservice_arm:${CIRCLE_TAG} + docker push usdotfhwaops/v2xhubarm:${CIRCLE_TAG} workflows: version: 2 build: @@ -233,5 +267,14 @@ workflows: - sonar-scanner_develop: requires: - docker_build_push_develop + - automated_release: + requires: + - docker_build_push + - arm_build_push + filters: + tags: + only: ^[\.0-9]*$ + branches: + only: master From b6874033520a76f946a0550cf5b9a0b2cab83008 Mon Sep 17 00:00:00 2001 From: Paul K Bourelly Date: Wed, 18 May 2022 17:04:08 -0400 Subject: [PATCH 3/6] Issue-396:Add docker login --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 225d7bcf0..bf8727df5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -235,6 +235,7 @@ jobs: name: Docker Push Release Tag # Push all tagged images command: | + echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USERNAME --password-stdin docker push usdotfhwaops/php:${CIRCLE_TAG} docker push usdotfhwaops/port-drayage-webservice:${CIRCLE_TAG} docker push usdotfhwaops/v2xhubamd:${CIRCLE_TAG} From 5220dfb88348b41e0636c9b553aa0a400621eb40 Mon Sep 17 00:00:00 2001 From: Paul K Bourelly Date: Thu, 19 May 2022 14:32:24 -0400 Subject: [PATCH 4/6] Update release notes and docker-compose for 7.2.3 --- configuration/amd64/docker-compose.yml | 6 +++--- configuration/arm64/docker-compose.yml | 6 +++--- docs/Release_notes.md | 12 ++++++++++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/configuration/amd64/docker-compose.yml b/configuration/amd64/docker-compose.yml index ab2b4f489..82e1ae302 100755 --- a/configuration/amd64/docker-compose.yml +++ b/configuration/amd64/docker-compose.yml @@ -19,7 +19,7 @@ services: - ./mysql/port_drayage.sql:/docker-entrypoint-initdb.d/port_drayage.sql php: - image: usdotfhwaops/php:7.2.2 + image: usdotfhwaops/php:7.2.3 container_name: php network_mode: host depends_on: @@ -29,7 +29,7 @@ services: tty: true v2xhub: - image: usdotfhwaops/v2xhubamd:7.2.2 + image: usdotfhwaops/v2xhubamd:7.2.3 container_name: v2xhub network_mode: host restart: always @@ -43,7 +43,7 @@ services: - ./logs:/var/log/tmx - ./MAP:/var/www/plugins/MAP port_drayage_webservice: - image: usdotfhwaops/port-drayage-webservice:7.2.2 + image: usdotfhwaops/port-drayage-webservice:7.2.3 container_name: port_drayage_webservice network_mode: host secrets: diff --git a/configuration/arm64/docker-compose.yml b/configuration/arm64/docker-compose.yml index d614cf150..a58b5c507 100644 --- a/configuration/arm64/docker-compose.yml +++ b/configuration/arm64/docker-compose.yml @@ -19,7 +19,7 @@ services: - ./mysql/port_drayage.sql:/docker-entrypoint-initdb.d/port_drayage.sql php: - image: usdotfhwaops/php_arm:7.2.2 + image: usdotfhwaops/php_arm:7.2.3 container_name: php network_mode: host depends_on: @@ -29,7 +29,7 @@ services: tty: true v2xhub: - image: usdotfhwaops/v2xhubarm:7.2.2 + image: usdotfhwaops/v2xhubarm:7.2.3 container_name: v2xhub network_mode: host restart: always @@ -43,7 +43,7 @@ services: - ./logs:/var/log/tmx - ./MAP:/var/www/plugins/MAP port_drayage_webservice: - image: usdotfhwaops/port-drayage-webservice_arm:7.2.2 + image: usdotfhwaops/port-drayage-webservice_arm:7.2.3 container_name: port_drayage_webservice network_mode: host secrets: diff --git a/docs/Release_notes.md b/docs/Release_notes.md index f2d87f99a..89d299c43 100644 --- a/docs/Release_notes.md +++ b/docs/Release_notes.md @@ -1,5 +1,17 @@ V2X-Hub Release Notes ---------------------------- +Version 7.2.3, released May 19th, 2022 +-------------------------------------------------------- +**Summary:** +V2X Hub release 7.2.3 includes added hot fix for MobilityRequest and MobilityResponse ASN1 Compiler generated encoding/decoding code for Voices project. + +Bug fixes in this release: +- Issue 372: After getting the dsrc messages from a vehicle, the v2xhub message receiver is able to pass it to other plugins. However, the other plugins experience decoding issues trying to filter MobilityRequest and MobilityResponse messages. + +Enhancements in this release: + - Issue 369:Add CircleCI workflow that is triggered on numeric github tags on only the master branch. This workflow will be dependent on the build and push workflows for both ARM and AMD images. The workflow will then pull, retag with the github tag name, and push release images. + +------------------------------ Version 7.2.2, released May 9th, 2022 -------------------------------------------------------- **Summary:** From 05d320169af59d21cdc3cc5ba429df997e74fc6e Mon Sep 17 00:00:00 2001 From: Paul K Bourelly Date: Thu, 19 May 2022 15:15:17 -0400 Subject: [PATCH 5/6] Issue-396:Filter conditions are ORed + Added ignore all branches because filter conditions are ORed. --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bf8727df5..86208c59e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -274,8 +274,9 @@ workflows: - arm_build_push filters: tags: - only: ^[\.0-9]*$ + only: /^[\.0-9]*$/ branches: - only: master + ignore: /.*/ + From 6001e0bd54c922e8f28bcbb9467f30915f5e3a5e Mon Sep 17 00:00:00 2001 From: Paul K Bourelly Date: Thu, 19 May 2022 15:27:14 -0400 Subject: [PATCH 6/6] Issue-396: Added filter to all dependent workflows --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 86208c59e..c33deeb10 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -254,10 +254,14 @@ workflows: filters: branches: ignore: develop + tags: + only: /^[\.0-9]*$/ - arm_build_push: filters: branches: ignore: develop + tags: + only: /^[\.0-9]*$/ - arm_build_push_develop : filters: branches: