Skip to content

Commit

Permalink
v1.5.3 Release (#454)
Browse files Browse the repository at this point in the history
* actually link against mbedtls for common lws build

If we're using mbedtls instead of ssl we need to actually link against it when building kvsCommonLws, it is done properly for common curl, but was incorrect for Lws path

* Update CMakeLists.txt

version bump

* Fix some of the CI jobs (#456)

* Update CMakeLists.txt

* install pkgconfiglite windows ci

* Revert "Update CMakeLists.txt"

This reverts commit f4caee0.

* Switch GCC to gcc-14 of Mac CI

* Switch to GCC 12 for Mac CI

* Try mac os 11

* Update ci.yml

* Update ci.yml

* latest runners

* Fix typo

* Uncomment the other tests

* Comment back out the sanitizers

* More CI Fixes (#457)

* Fix remaining CI tests (#459)

* Update runner versions

* Run CI on this branch

* Update ci.yml

* Don't downgrade Xcode to 15.2

* Update ci.yml

* Update GCC Version to 14 for Intel-Mac CI test

---------

Co-authored-by: Stefan Kieszkowski <85728496+stefankiesz@users.noreply.github.com>
  • Loading branch information
hassanctech and stefankiesz authored Oct 3, 2024
1 parent 3e519b7 commit 0d23ba8
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 20 deletions.
32 changes: 14 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- master
jobs:
clang-format-check:
runs-on: macos-11
runs-on: macos-latest
steps:
- name: Clone repository
uses: actions/checkout@v3
Expand All @@ -29,8 +29,8 @@ jobs:
id-token: write
contents: read
env:
CC: /usr/local/bin/gcc-13
CXX: /usr/local/bin/g++-13
CC: gcc-14
CXX: g++-14
AWS_KVS_LOG_LEVEL: 2
steps:
- name: Clone repository
Expand All @@ -55,7 +55,7 @@ jobs:
./tst/producer_test
mac-os-build-clang:
runs-on: macos-11
runs-on: macos-12
env:
AWS_KVS_LOG_LEVEL: 2
permissions:
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
./tst/producer_test
mac-os-m1-build-clang:
runs-on: macos-13-xlarge
runs-on: macos-latest
env:
AWS_KVS_LOG_LEVEL: 2
permissions:
Expand Down Expand Up @@ -113,19 +113,15 @@ jobs:
./tst/producer_test
mac-os-m1-build-gcc:
runs-on: macos-13-xlarge
runs-on: macos-latest
env:
CC: /opt/homebrew/bin/gcc-13
CXX: /opt/homebrew/bin/g++-13
CC: gcc-13
CXX: g++-13
AWS_KVS_LOG_LEVEL: 2
permissions:
id-token: write
contents: read
steps:
- name: Setup XCode version 15.2
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.2'
- name: Clone repository
uses: actions/checkout@v3
- name: Build repository
Expand All @@ -148,13 +144,13 @@ jobs:
./tst/producer_test
mac-os-build-gcc-local-openssl:
runs-on: macos-11
runs-on: macos-12
permissions:
id-token: write
contents: read
env:
CC: /usr/local/bin/gcc-13
CXX: /usr/local/bin/g++-13
CC: gcc-14
CXX: g++-14
AWS_KVS_LOG_LEVEL: 2
LDFLAGS: -L/usr/local/opt/openssl@3/lib
CPPFLAGS: -I/usr/local/opt/openssl@3/include
Expand All @@ -181,7 +177,7 @@ jobs:
./tst/producer_test
mac-os-build-clang-local-openssl:
runs-on: macos-latest
runs-on: macos-12
env:
AWS_KVS_LOG_LEVEL: 2
LDFLAGS: -L/usr/local/opt/openssl@3/lib
Expand Down Expand Up @@ -330,7 +326,7 @@ jobs:
# ulimit -c unlimited -S
# timeout --signal=SIGABRT 150m ./tst/producer_test --gtest_break_on_failure

#thread-sanitizer:
# thread-sanitizer:
# runs-on: ubuntu-20.04
# permissions:
# id-token: write
Expand Down Expand Up @@ -405,7 +401,7 @@ jobs:
uses: actions/checkout@v3
- name: Install dependencies
run: |
choco install nasm strawberryperl
choco install nasm strawberryperl pkgconfiglite
- name: Build repository
run: |
$env:Path += ';C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Strawberry\c\bin;C:\Program Files\NASM;D:\a\amazon-kinesis-video-streams-producer-c\amazon-kinesis-video-streams-producer-c\open-source\lib;D:\a\amazon-kinesis-video-streams-producer-c\amazon-kinesis-video-streams-producer-c\open-source\bin'
Expand Down
5 changes: 3 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.6.3)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}")
include(Utilities)
project(KinesisVideoProducerC VERSION 1.5.2 LANGUAGES C)
project(KinesisVideoProducerC VERSION 1.5.3 LANGUAGES C)

set(KINESIS_VIDEO_PRODUCER_C_MAJOR_VERSION 1)
set(KINESIS_VIDEO_PRODUCER_C_MINOR_VERSION 5)
set(KINESIS_VIDEO_PRODUCER_C_PATCH_VERSION 2)
set(KINESIS_VIDEO_PRODUCER_C_PATCH_VERSION 3)
set(KINESIS_VIDEO_PRODUCER_C_VERSION ${KINESIS_VIDEO_PRODUCER_C_MAJOR_VERSION}.${KINESIS_VIDEO_PRODUCER_C_MINOR_VERSION}.${KINESIS_VIDEO_PRODUCER_C_PATCH_VERSION})

include(GNUInstallDirs)
Expand Down Expand Up @@ -289,6 +289,7 @@ if(BUILD_COMMON_LWS)
set_target_properties(kvsCommonLws PROPERTIES VERSION ${KINESIS_VIDEO_PRODUCER_C_VERSION} SOVERSION ${KINESIS_VIDEO_PRODUCER_C_MAJOR_VERSION})
endif()
target_link_libraries(kvsCommonLws
${PRODUCER_CRYPTO_LIBRARY}
${OPENSSL_CRYPTO_LIBRARY}
${OPENSSL_SSL_LIBRARY}
${LIBWEBSOCKETS_LIBRARIES}
Expand Down

0 comments on commit 0d23ba8

Please sign in to comment.