Skip to content

Commit 49fa6cb

Browse files
authored
Update CI tests (#1165)
* Set -DPKG_CONFIG_EXECUTABLE in windows bat * Update GStreamer version * Update gst pkgconfig path with msvc_x86_64 * Set to MacOS 12
1 parent 05b165a commit 49fa6cb

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

.github/build_windows.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Buil
22
mkdir build
33
cd build
44
cmd.exe /c cmake -G "NMake Makefiles" ..
5-
cmake -G "NMake Makefiles" -DBUILD_TEST=TRUE -DBUILD_GSTREAMER_PLUGIN=TRUE ..
5+
cmake -G "NMake Makefiles" -DBUILD_TEST=TRUE -DBUILD_GSTREAMER_PLUGIN=TRUE -DPKG_CONFIG_EXECUTABLE="D:\\gstreamer\\1.0\\msvc_x86_64\\bin\\pkg-config.exe" ..
66
nmake

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212

1313
jobs:
1414
mac-os-build-clang:
15-
runs-on: macos-11
15+
runs-on: macos-12
1616
env:
1717
AWS_KVS_LOG_LEVEL: 2
1818
permissions:
@@ -289,8 +289,8 @@ jobs:
289289
- name: Install dependencies
290290
run: |
291291
choco install nasm strawberryperl
292-
choco install gstreamer --version=1.16.2
293-
choco install gstreamer-devel --version=1.16.2
292+
choco install gstreamer --version=1.22.8
293+
choco install gstreamer-devel --version=1.22.8
294294
- name: Build repository
295295
run: |
296296
$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-sdk-cpp\amazon-kinesis-video-streams-producer-sdk-cpp\open-source\local\lib;D:\a\amazon-kinesis-video-streams-producer-sdk-cpp\amazon-kinesis-video-streams-producer-sdk-cpp\open-source\local\bin'

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,11 @@ else()
127127
endif()
128128

129129
if (WIN32)
130-
set(PKG_CONFIG_EXECUTABLE "C:\\gstreamer\\1.0\\x86_64\\bin\\pkg-config.exe")
130+
if(EXISTS "C:\\gstreamer\\1.0\\msvc_x86_64\\bin\\pkg-config.exe")
131+
set(PKG_CONFIG_EXECUTABLE "C:\\gstreamer\\1.0\\msvc_x86_64\\bin\\pkg-config.exe")
132+
else()
133+
set(PKG_CONFIG_EXECUTABLE "D:\\gstreamer\\1.0\\msvc_x86_64\\bin\\pkg-config.exe")
134+
endif()
131135
endif()
132136

133137
############# Enable Sanitizers ############

0 commit comments

Comments
 (0)