Skip to content

Commit efc9126

Browse files
committed
Fix GCC and Windows CI Tests (#1105)
* Update ci.yml compiler env var * Add refreshenv to windows build * Add import module for refreshenv call * Testing * Revert windows CI changes * Update ci.yml * Trying different PKG_CONFIG_EXECUTABLE path * Add msvc_ to path * More build testing * more * more * more * more * more * more * more * more * more * more * more * more * more * more * more * more * works, testing which line(s) is needed * more * more * Cleanup ci * cleanup cmake * Update README.md * Add check for C vs D drive * Revert ReadMe changes
1 parent 9ad8a59 commit efc9126

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ jobs:
6565
id-token: write
6666
contents: read
6767
env:
68-
CC: gcc
69-
CXX: g++
68+
CC: /usr/local/bin/gcc-13
69+
CXX: /usr/local/bin/g++-13
7070
AWS_KVS_LOG_LEVEL: 2
7171
steps:
7272
- name: Clone repository
@@ -205,7 +205,7 @@ jobs:
205205
timeout --signal=SIGABRT 60m ./tst/producerTest
206206
207207
# memory-sanitizer:
208-
# runs-on: ubuntu-20.04
208+
# runs-on: ubuntu-20.04
209209
# permissions:
210210
# id-token: write
211211
# contents: read
@@ -304,7 +304,7 @@ jobs:
304304
run: |
305305
choco install nasm strawberryperl
306306
choco install gstreamer --version=1.16.2
307-
choco install gstreamer-devel --version=1.16.2
307+
choco install gstreamer-devel --version=1.16.2
308308
- name: Build repository
309309
run: |
310310
$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\\x86_64\\bin\\pkg-config.exe")
131+
set(PKG_CONFIG_EXECUTABLE "C:\\gstreamer\\1.0\\x86_64\\bin\\pkg-config.exe")
132+
else()
133+
set(PKG_CONFIG_EXECUTABLE "D:\\gstreamer\\1.0\\x86_64\\bin\\pkg-config.exe")
134+
endif()
131135
endif()
132136

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

0 commit comments

Comments
 (0)