Skip to content

Commit 0d23ba8

Browse files
v1.5.3 Release (#454)
* 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 <[email protected]>
1 parent 3e519b7 commit 0d23ba8

File tree

2 files changed

+17
-20
lines changed

2 files changed

+17
-20
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- master
1212
jobs:
1313
clang-format-check:
14-
runs-on: macos-11
14+
runs-on: macos-latest
1515
steps:
1616
- name: Clone repository
1717
uses: actions/checkout@v3
@@ -29,8 +29,8 @@ jobs:
2929
id-token: write
3030
contents: read
3131
env:
32-
CC: /usr/local/bin/gcc-13
33-
CXX: /usr/local/bin/g++-13
32+
CC: gcc-14
33+
CXX: g++-14
3434
AWS_KVS_LOG_LEVEL: 2
3535
steps:
3636
- name: Clone repository
@@ -55,7 +55,7 @@ jobs:
5555
./tst/producer_test
5656
5757
mac-os-build-clang:
58-
runs-on: macos-11
58+
runs-on: macos-12
5959
env:
6060
AWS_KVS_LOG_LEVEL: 2
6161
permissions:
@@ -84,7 +84,7 @@ jobs:
8484
./tst/producer_test
8585
8686
mac-os-m1-build-clang:
87-
runs-on: macos-13-xlarge
87+
runs-on: macos-latest
8888
env:
8989
AWS_KVS_LOG_LEVEL: 2
9090
permissions:
@@ -113,19 +113,15 @@ jobs:
113113
./tst/producer_test
114114
115115
mac-os-m1-build-gcc:
116-
runs-on: macos-13-xlarge
116+
runs-on: macos-latest
117117
env:
118-
CC: /opt/homebrew/bin/gcc-13
119-
CXX: /opt/homebrew/bin/g++-13
118+
CC: gcc-13
119+
CXX: g++-13
120120
AWS_KVS_LOG_LEVEL: 2
121121
permissions:
122122
id-token: write
123123
contents: read
124124
steps:
125-
- name: Setup XCode version 15.2
126-
uses: maxim-lobanov/setup-xcode@v1
127-
with:
128-
xcode-version: '15.2'
129125
- name: Clone repository
130126
uses: actions/checkout@v3
131127
- name: Build repository
@@ -148,13 +144,13 @@ jobs:
148144
./tst/producer_test
149145
150146
mac-os-build-gcc-local-openssl:
151-
runs-on: macos-11
147+
runs-on: macos-12
152148
permissions:
153149
id-token: write
154150
contents: read
155151
env:
156-
CC: /usr/local/bin/gcc-13
157-
CXX: /usr/local/bin/g++-13
152+
CC: gcc-14
153+
CXX: g++-14
158154
AWS_KVS_LOG_LEVEL: 2
159155
LDFLAGS: -L/usr/local/opt/openssl@3/lib
160156
CPPFLAGS: -I/usr/local/opt/openssl@3/include
@@ -181,7 +177,7 @@ jobs:
181177
./tst/producer_test
182178
183179
mac-os-build-clang-local-openssl:
184-
runs-on: macos-latest
180+
runs-on: macos-12
185181
env:
186182
AWS_KVS_LOG_LEVEL: 2
187183
LDFLAGS: -L/usr/local/opt/openssl@3/lib
@@ -330,7 +326,7 @@ jobs:
330326
# ulimit -c unlimited -S
331327
# timeout --signal=SIGABRT 150m ./tst/producer_test --gtest_break_on_failure
332328

333-
#thread-sanitizer:
329+
# thread-sanitizer:
334330
# runs-on: ubuntu-20.04
335331
# permissions:
336332
# id-token: write
@@ -405,7 +401,7 @@ jobs:
405401
uses: actions/checkout@v3
406402
- name: Install dependencies
407403
run: |
408-
choco install nasm strawberryperl
404+
choco install nasm strawberryperl pkgconfiglite
409405
- name: Build repository
410406
run: |
411407
$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'

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
cmake_minimum_required(VERSION 3.6.3)
22
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}")
33
include(Utilities)
4-
project(KinesisVideoProducerC VERSION 1.5.2 LANGUAGES C)
4+
project(KinesisVideoProducerC VERSION 1.5.3 LANGUAGES C)
55

66
set(KINESIS_VIDEO_PRODUCER_C_MAJOR_VERSION 1)
77
set(KINESIS_VIDEO_PRODUCER_C_MINOR_VERSION 5)
8-
set(KINESIS_VIDEO_PRODUCER_C_PATCH_VERSION 2)
8+
set(KINESIS_VIDEO_PRODUCER_C_PATCH_VERSION 3)
99
set(KINESIS_VIDEO_PRODUCER_C_VERSION ${KINESIS_VIDEO_PRODUCER_C_MAJOR_VERSION}.${KINESIS_VIDEO_PRODUCER_C_MINOR_VERSION}.${KINESIS_VIDEO_PRODUCER_C_PATCH_VERSION})
1010

1111
include(GNUInstallDirs)
@@ -289,6 +289,7 @@ if(BUILD_COMMON_LWS)
289289
set_target_properties(kvsCommonLws PROPERTIES VERSION ${KINESIS_VIDEO_PRODUCER_C_VERSION} SOVERSION ${KINESIS_VIDEO_PRODUCER_C_MAJOR_VERSION})
290290
endif()
291291
target_link_libraries(kvsCommonLws
292+
${PRODUCER_CRYPTO_LIBRARY}
292293
${OPENSSL_CRYPTO_LIBRARY}
293294
${OPENSSL_SSL_LIBRARY}
294295
${LIBWEBSOCKETS_LIBRARIES}

0 commit comments

Comments
 (0)