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.

Sign up for GitHub

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

Jump to bottom

Set Producer C SDK to a Release Tag; CI Fix #1204

Merged
merged 11 commits into from
Oct 10, 2024
Merged

Set Producer C SDK to a Release Tag; CI Fix #1204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6d99981
Update libkvscproducer-CMakeLists.txt
stefankiesz Sep 18, 2024
e4633e6
Update libkvscproducer-CMakeLists.txt
stefankiesz Oct 9, 2024
4af993b
Shorten Windows CI path
stefankiesz Oct 9, 2024
50ae41d
Move repo to the new location in CI
stefankiesz Oct 9, 2024
4435f8d
Fix the path
stefankiesz Oct 9, 2024
e7ce28c
Update ci.yml
stefankiesz Oct 9, 2024
321423e
Fix path
stefankiesz Oct 9, 2024
7c6395c
Update ci.yml
stefankiesz Oct 9, 2024
0510a35
Update ci.yml
stefankiesz Oct 9, 2024
9d6565b
Update ci.yml
stefankiesz Oct 9, 2024
9076a20
Bump Mac runner image from 12 to 13
stefankiesz Oct 10, 2024
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
18 changes: 12 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
mac-os-build-clang:
runs-on: macos-12
runs-on: macos-13
env:
AWS_KVS_LOG_LEVEL: 2
permissions:
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
./tst/producerTest

mac-os-build-gcc:
runs-on: macos-12
runs-on: macos-13
permissions:
id-token: write
contents: read
Expand Down Expand Up @@ -286,16 +286,22 @@ jobs:
steps:
- name: Clone repository
uses: actions/checkout@v3
- name: Move repository
run: |
mkdir C:\producer
Move-Item -Path "D:\a\amazon-kinesis-video-streams-producer-sdk-cpp\amazon-kinesis-video-streams-producer-sdk-cpp\*" -Destination "D:\producer"
- name: Install dependencies
run: |
choco install nasm strawberryperl
choco install gstreamer --version=1.22.8
choco install gstreamer-devel --version=1.22.8
- 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'
$env:Path += ';C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Strawberry\c\bin;C:\Program Files\NASM;D:\producer\open-source\local\lib;D:\producer\open-source\local\bin'
git config --system core.longpaths true
.github/build_windows.bat
cd D:\producer
dir
.\build_windows.bat
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1-node16
with:
Expand All @@ -305,8 +311,8 @@ jobs:
role-duration-seconds: 10800
- name: Run tests
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'
& "D:\a\amazon-kinesis-video-streams-producer-sdk-cpp\amazon-kinesis-video-streams-producer-sdk-cpp\build\tst\producerTest.exe"
$env:Path += ';C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Strawberry\c\bin;C:\Program Files\NASM;D:\producer\open-source\local\lib;D:\producer\open-source\local\bin'
& "D:\producer\build\tst\producerTest.exe"

arm64-cross-compilation:
runs-on: ubuntu-20.04
Expand Down
2 changes: 1 addition & 1 deletion CMake/Dependencies/libkvscproducer-CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ include(ExternalProject)
# clone repo only
ExternalProject_Add(libkvscproducer-download
GIT_REPOSITORY https://github.com/awslabs/amazon-kinesis-video-streams-producer-c.git
GIT_TAG 178109a5dbfc5288ba5cf7fab1dc1afd5e2e182b
GIT_TAG v1.5.3
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/kvscproducer-src"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/kvscproducer-build"
CONFIGURE_COMMAND ""
Expand Down
Loading