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

Duplicate event fix for master #838

Merged
merged 21 commits into from
Mar 27, 2022
Merged

Conversation

jdelapla
Copy link
Contributor

Issue #, if available:

Description of changes:

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

jdelapla and others added 19 commits September 1, 2021 17:09
* Minor syntax fix

.. is required for fetching files from parent dir ... without .. it throws error

* Update README and travis.yml to acknowledge develop

* Fix typo in readme

* add free missing (#746)

Co-authored-by: David D <david.desbiens@tentaq.com>

* Update readme (#744)

* Fix typo in readme

* Update Readme

Debug section: add solution to cmake error "could not find JNI"

Co-authored-by: Hassan Sahibzada <hsahibza@amazon.com>

* Add instruction to set offline mode (#741)

Co-authored-by: Hassan Sahibzada <hsahibza@amazon.com>

Co-authored-by: Ketul shah <ketulshah1993@gmail.com>
Co-authored-by: Jeremy Gunawan <jggunawa@amazon.com>
Co-authored-by: waikup83 <waikup@hotmail.com>
Co-authored-by: David D <david.desbiens@tentaq.com>
Co-authored-by: Hassan Sahibzada <hsahibza@amazon.com>
Co-authored-by: Divya Sampath Kumar <disa6302@colorado.edu>
* untie stream-name and thing-name

* fixup spacing

Co-authored-by: tom schuring <tschuring@mtdata.com.au>
* expose addFileLoggerPlatformCallbacksProvider in Java with JNI

* updated addFileLoggerPlatformCallbacksProvider to parse file path

* added a callback from JNI to a Java function for logging

* updated logPrintFunc calback

* missed client_handle initialization in constructor

* added comments

* white space change to trigger travis
* github actions setup; disable travis for develop

* fix syntax error:

* fix syntax error

* fix linux builds

* fix linux builds

* fix linux builds

* add missing packages

* add keys to env vars

* check env vars

* check env vars

* fix builds

* fix builds on ga

* test mac clang on ga

* test mac clang on ga

* test mac clang on ga

* test mac clang on ga

* test mac clang on ga

* unsetting the token

* unsetting the token

* test macos clang

* test macos clang

* stop travis builds on each push

* use oidc

* fix windows build

* fix test instruction

* comment failing builds on travis and ga

* update gcc and macos versions

* update cmake

* update cmake

* use latest os, update log levels, uncomment travis

* update failing build

* update failing build

* trigger travis

* trigger travis

* Revert "trigger travis"

This reverts commit d511f15.

* update msvc path, add windows to ga, remove from travis

* trigger travis

* trigger travis w/o passing builds

* add cpath and ldflags for mac build

* Revert "add cpath and ldflags for mac build"

This reverts commit fafad7b.

* test ubsan build

* fix cmake instruction for mac-gcc

* remove travis file

* remove travis checks
* use oidc right before tests

* run ga builds for branch

* fix test path

* update branches

* set creds expiration time
)

* setup arm cross compilation

* update the package list

* fix  in

* specify host in log4cplus

* specify host in log4cplus

* specify host in log4cplus

* run all builds with new host config in log4cplus

* build with gstreamer and dependencies

* build with gstreamer and dependencies

* build with gstreamer and dependencies and openssl

* build with gstreamer and openssl

* specify build and host

* specify build and host

* specify build host and target

* specify same build and host

* specify build and host in all cmake files

* use a different compiler

* use a different compiler

* echo compiler

* set CC and CXX correctly

* set CC and CXX correctly

* set openssl platform

* set openssl platform

* set openssl platform

* expose host name for log4cplus

* change log4cplus host name

* fix cmake syntax error

* fix cmke log4plus condition

* fix cmake log4plus condition

* fix cmake log4plus condition

* change var name cmake

* change var name in ci

* update cmake instruction in ci

* check conditions for log4cplus in cmake

* check conditions for log4cplus in cmake

* use set instead of option in cmake

* check messages

* fix ci cmake instruction

* fix ci cmake instruction

* add definition

* use env var

* use env var

* use build args

* update readme

* remove host-name from qemu arm build

* update readme for cross-compile instructions

* add aarch64; move log config file

* remove qemu
disa6302
disa6302 previously approved these changes Mar 25, 2022
@disa6302
Copy link
Contributor

On another note: If we are getting master up to date with develop in this PR, wondering why travis CI file still shows up. Develop branch has completely moved to GHA.

@codecov-commenter
Copy link

Codecov Report

Merging #838 (121da2b) into master (0121f2d) will decrease coverage by 0.17%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master     #838      +/-   ##
==========================================
- Coverage   69.47%   69.30%   -0.18%     
==========================================
  Files          32       32              
  Lines        1661     1668       +7     
==========================================
+ Hits         1154     1156       +2     
- Misses        507      512       +5     
Impacted Files Coverage Δ
src/KinesisVideoStream.cpp 47.77% <0.00%> (-3.42%) ⬇️
src/KinesisVideoStream.h 100.00% <ø> (ø)
tst/ProducerTestFixture.h 84.53% <0.00%> (+1.20%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0121f2d...121da2b. Read the comment docs.

disa6302
disa6302 previously approved these changes Mar 25, 2022
Copy link
Contributor

@disa6302 disa6302 left a comment

Choose a reason for hiding this comment

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

Perfect!

@jdelapla jdelapla merged commit 2b343c9 into master Mar 27, 2022
benwkim pushed a commit that referenced this pull request Mar 17, 2023
* Update for develop (#740)

* Minor syntax fix

.. is required for fetching files from parent dir ... without .. it throws error

* Update README and travis.yml to acknowledge develop

* Fix typo in readme

* add free missing (#746)

Co-authored-by: David D <david.desbiens@tentaq.com>

* Update readme (#744)

* Fix typo in readme

* Update Readme

Debug section: add solution to cmake error "could not find JNI"

Co-authored-by: Hassan Sahibzada <hsahibza@amazon.com>

* Add instruction to set offline mode (#741)

Co-authored-by: Hassan Sahibzada <hsahibza@amazon.com>

Co-authored-by: Ketul shah <ketulshah1993@gmail.com>
Co-authored-by: Jeremy Gunawan <jggunawa@amazon.com>
Co-authored-by: waikup83 <waikup@hotmail.com>
Co-authored-by: David D <david.desbiens@tentaq.com>
Co-authored-by: Hassan Sahibzada <hsahibza@amazon.com>
Co-authored-by: Divya Sampath Kumar <disa6302@colorado.edu>

* updated cmake verison from 2.8 to 3.6.3

* Fix bug that leads to losing initial frames

* Update to top of producer C commit

* Untie stream-name and thing-name (#785)

* untie stream-name and thing-name

* fixup spacing

Co-authored-by: tom schuring <tschuring@mtdata.com.au>

* update docs for iot-thing-name usage

* Expose file logging jni develop (#770)

* expose addFileLoggerPlatformCallbacksProvider in Java with JNI

* updated addFileLoggerPlatformCallbacksProvider to parse file path

* added a callback from JNI to a Java function for logging

* updated logPrintFunc calback

* missed client_handle initialization in constructor

* added comments

* white space change to trigger travis

* Images feature and sample support

* GitHub actions setup (#815)

* github actions setup; disable travis for develop

* fix syntax error:

* fix syntax error

* fix linux builds

* fix linux builds

* fix linux builds

* add missing packages

* add keys to env vars

* check env vars

* check env vars

* fix builds

* fix builds on ga

* test mac clang on ga

* test mac clang on ga

* test mac clang on ga

* test mac clang on ga

* test mac clang on ga

* unsetting the token

* unsetting the token

* test macos clang

* test macos clang

* stop travis builds on each push

* use oidc

* fix windows build

* fix test instruction

* comment failing builds on travis and ga

* update gcc and macos versions

* update cmake

* update cmake

* use latest os, update log levels, uncomment travis

* update failing build

* update failing build

* trigger travis

* trigger travis

* Revert "trigger travis"

This reverts commit d511f15.

* update msvc path, add windows to ga, remove from travis

* trigger travis

* trigger travis w/o passing builds

* add cpath and ldflags for mac build

* Revert "add cpath and ldflags for mac build"

This reverts commit fafad7b.

* test ubsan build

* fix cmake instruction for mac-gcc

* remove travis file

* remove travis checks

* Update Producer-c to new master

* Updated to the ACTUAL master...

* Fix OIDC for GitHub Actions (#824)

* use oidc right before tests

* run ga builds for branch

* fix test path

* update branches

* set creds expiration time

* testing re-order tags changes

* Updated Producer, now putEventMetadata returns with an error if the first cluster has not been started

* updated kvs_gstreamer_sample.cpp to also use the event metadata feature on every key frame

* Add ARM build to GA, log4cplus host name fix for cross compilation (#831)

* setup arm cross compilation

* update the package list

* fix  in

* specify host in log4cplus

* specify host in log4cplus

* specify host in log4cplus

* run all builds with new host config in log4cplus

* build with gstreamer and dependencies

* build with gstreamer and dependencies

* build with gstreamer and dependencies and openssl

* build with gstreamer and openssl

* specify build and host

* specify build and host

* specify build host and target

* specify same build and host

* specify build and host in all cmake files

* use a different compiler

* use a different compiler

* echo compiler

* set CC and CXX correctly

* set CC and CXX correctly

* set openssl platform

* set openssl platform

* set openssl platform

* expose host name for log4cplus

* change log4cplus host name

* fix cmake syntax error

* fix cmke log4plus condition

* fix cmake log4plus condition

* fix cmake log4plus condition

* change var name cmake

* change var name in ci

* update cmake instruction in ci

* check conditions for log4cplus in cmake

* check conditions for log4cplus in cmake

* use set instead of option in cmake

* check messages

* fix ci cmake instruction

* fix ci cmake instruction

* add definition

* use env var

* use env var

* use build args

* update readme

* remove host-name from qemu arm build

* update readme for cross-compile instructions

* add aarch64; move log config file

* remove qemu

* fix config file path (#835)

* Duplicate fix, sample cleanup

* Test was 'sometimes' triggering. Needed more frames to ensure its success

Co-authored-by: Ketul shah <ketulshah1993@gmail.com>
Co-authored-by: Jeremy Gunawan <jggunawa@amazon.com>
Co-authored-by: waikup83 <waikup@hotmail.com>
Co-authored-by: David D <david.desbiens@tentaq.com>
Co-authored-by: Hassan Sahibzada <hsahibza@amazon.com>
Co-authored-by: Divya Sampath Kumar <disa6302@colorado.edu>
Co-authored-by: Niyati Maheshwari <niyatim23@gmail.com>
Co-authored-by: clogwog <tomschuring@gmail.com>
Co-authored-by: tom schuring <tschuring@mtdata.com.au>
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