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

Fix GCC and Windows CI Tests #1105

Merged
merged 33 commits into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ec8bd54
Update ci.yml compiler env var
stefankiesz Nov 18, 2023
988082b
Add refreshenv to windows build
stefankiesz Nov 18, 2023
78957df
Add import module for refreshenv call
stefankiesz Nov 18, 2023
99f101f
Testing
stefankiesz Nov 18, 2023
1b05b9a
Revert windows CI changes
stefankiesz Nov 27, 2023
c901eba
Update ci.yml
stefankiesz Nov 27, 2023
5b3fb9a
Trying different PKG_CONFIG_EXECUTABLE path
stefankiesz Nov 27, 2023
3fe2b3b
Add msvc_ to path
stefankiesz Nov 27, 2023
bed4c5a
More build testing
stefankiesz Nov 27, 2023
10582cd
more
stefankiesz Nov 27, 2023
514c9c1
more
stefankiesz Nov 28, 2023
2b9f35d
more
stefankiesz Nov 28, 2023
66c4009
more
stefankiesz Nov 28, 2023
9e8b370
more
stefankiesz Nov 28, 2023
7d63b1b
more
stefankiesz Nov 28, 2023
e9ebf64
more
stefankiesz Nov 28, 2023
2ad6942
more
stefankiesz Nov 28, 2023
a4371f5
more
stefankiesz Nov 28, 2023
97b594e
more
stefankiesz Nov 28, 2023
c90e8c0
more
stefankiesz Nov 28, 2023
f5aa8ed
more
stefankiesz Nov 28, 2023
bbb2c9b
more
stefankiesz Nov 28, 2023
b4007bb
more
stefankiesz Nov 28, 2023
0ad7434
more
stefankiesz Nov 28, 2023
86e39d0
more
stefankiesz Nov 28, 2023
7b50355
works, testing which line(s) is needed
stefankiesz Nov 28, 2023
de16e3f
more
stefankiesz Nov 28, 2023
cc8f999
more
stefankiesz Nov 28, 2023
fc65eda
Cleanup ci
stefankiesz Nov 28, 2023
683cddf
cleanup cmake
stefankiesz Nov 28, 2023
4aa20fa
Update README.md
stefankiesz Nov 29, 2023
3a6a79a
Add check for C vs D drive
stefankiesz Nov 29, 2023
3c85801
Revert ReadMe changes
stefankiesz Nov 29, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ jobs:
id-token: write
contents: read
env:
CC: gcc
CXX: g++
CC: /usr/local/bin/gcc-13
CXX: /usr/local/bin/g++-13
AWS_KVS_LOG_LEVEL: 2
steps:
- name: Clone repository
Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
timeout --signal=SIGABRT 60m ./tst/producerTest
# memory-sanitizer:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-20.04
# permissions:
# id-token: write
# contents: read
Expand Down Expand Up @@ -291,7 +291,7 @@ jobs:
run: |
choco install nasm strawberryperl
choco install gstreamer --version=1.16.2
choco install gstreamer-devel --version=1.16.2
choco install gstreamer-devel --version=1.16.2
- 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-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'
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ else()
endif()

if (WIN32)
set(PKG_CONFIG_EXECUTABLE "C:\\gstreamer\\1.0\\x86_64\\bin\\pkg-config.exe")
set(PKG_CONFIG_EXECUTABLE "D:\\gstreamer\\1.0\\x86_64\\bin\\pkg-config.exe")
niyatim23 marked this conversation as resolved.
Show resolved Hide resolved
endif()

############# Enable Sanitizers ############
Expand Down