Skip to content

Bump the runner images & fix the CI #462

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

Merged
merged 8 commits into from
Nov 20, 2024
Merged

Bump the runner images & fix the CI #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dd8b674
Bump the runner images
sirknightj Nov 18, 2024
0fd3427
Bump configure-aws-credentials to v4.
sirknightj Nov 18, 2024
2198acd
Downgrade to clang 11
sirknightj Nov 18, 2024
b7ea30b
Sanitzer options
sirknightj Nov 18, 2024
569aac2
Go back to clang 14. Turn off warnings as error for libwebsockets
sirknightj Nov 18, 2024
57cb19e
ON -> 1
sirknightj Nov 19, 2024
1bde100
Wno-error via CFLAGS
sirknightj Nov 19, 2024
9b4f325
Pass C_FLAGS directly
sirknightj Nov 19, 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
50 changes: 25 additions & 25 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
bash scripts/check-clang.sh

mac-os-build-gcc:
runs-on: macos-12
runs-on: macos-13
permissions:
id-token: write
contents: read
Expand All @@ -43,7 +43,7 @@ jobs:
cmake .. --trace -DBUILD_TEST=TRUE
make
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1-node16
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
Expand All @@ -55,7 +55,7 @@ jobs:
./tst/producer_test

mac-os-build-clang:
runs-on: macos-12
runs-on: macos-13
env:
AWS_KVS_LOG_LEVEL: 2
permissions:
Expand All @@ -72,7 +72,7 @@ jobs:
cmake .. -DBUILD_TEST=TRUE -DCOMPILER_WARNINGS=TRUE
make
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1-node16
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
cmake .. -DBUILD_TEST=TRUE -DCOMPILER_WARNINGS=TRUE -DCMAKE_C_COMPILER=$(brew --prefix llvm@15)/bin/clang -DCMAKE_CXX_COMPILER=$(brew --prefix llvm@15)/bin/clang++
make
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1-node16
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
cmake .. -DBUILD_TEST=TRUE -DCOMPILER_WARNINGS=TRUE
make
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1-node16
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
Expand All @@ -144,7 +144,7 @@ jobs:
./tst/producer_test

mac-os-build-gcc-local-openssl:
runs-on: macos-12
runs-on: macos-13
permissions:
id-token: write
contents: read
Expand All @@ -165,7 +165,7 @@ jobs:
cmake .. -DBUILD_TEST=TRUE -DLOCAL_OPENSSL_BUILD=ON
make
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1-node16
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
Expand All @@ -177,7 +177,7 @@ jobs:
./tst/producer_test

mac-os-build-clang-local-openssl:
runs-on: macos-12
runs-on: macos-13
env:
AWS_KVS_LOG_LEVEL: 2
LDFLAGS: -L/usr/local/opt/openssl@3/lib
Expand All @@ -196,7 +196,7 @@ jobs:
cmake .. -DBUILD_TEST=TRUE -DCOMPILER_WARNINGS=TRUE -DLOCAL_OPENSSL_BUILD=ON
make
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1-node16
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
Expand All @@ -208,7 +208,7 @@ jobs:
./tst/producer_test

linux-gcc-code-coverage:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
env:
AWS_KVS_LOG_LEVEL: 2
permissions:
Expand All @@ -223,7 +223,7 @@ jobs:
cmake .. -DCODE_COVERAGE=TRUE -DBUILD_TEST=TRUE -DBUILD_COMMON_LWS=TRUE
make
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1-node16
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
Expand All @@ -241,7 +241,7 @@ jobs:
bash <(curl -s https://codecov.io/bash)

address-sanitizer:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
permissions:
id-token: write
contents: read
Expand All @@ -258,7 +258,7 @@ jobs:
cmake .. -DBUILD_TEST=TRUE -DADDRESS_SANITIZER=TRUE -DBUILD_COMMON_LWS=TRUE
make
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1-node16
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
Expand All @@ -271,7 +271,7 @@ jobs:
timeout --signal=SIGABRT 150m ./tst/producer_test --gtest_break_on_failure

undefined-behavior-sanitizer:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
permissions:
id-token: write
contents: read
Expand All @@ -288,7 +288,7 @@ jobs:
cmake .. -DBUILD_TEST=TRUE -DUNDEFINED_BEHAVIOR_SANITIZER=TRUE -DBUILD_COMMON_LWS=TRUE
make
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1-node16
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
Expand All @@ -313,7 +313,7 @@ jobs:
# - name: Clone repository
# uses: actions/checkout@v3
# - name: Configure AWS Credentials
# uses: aws-actions/configure-aws-credentials@v1-node16
# uses: aws-actions/configure-aws-credentials@v4
# with:
# role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
# role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
Expand All @@ -339,7 +339,7 @@ jobs:
# - name: Clone repository
# uses: actions/checkout@v3
# - name: Configure AWS Credentials
# uses: aws-actions/configure-aws-credentials@v1-node16
# uses: aws-actions/configure-aws-credentials@v4
# with:
# role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
# role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
Expand All @@ -356,7 +356,7 @@ jobs:
# timeout --signal=SIGABRT 150m ./tst/producer_test --gtest_break_on_failure

ubuntu-gcc:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
env:
AWS_KVS_LOG_LEVEL: 2
CC: gcc
Expand All @@ -377,7 +377,7 @@ jobs:
cmake .. -DBUILD_TEST=TRUE
make
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1-node16
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
Expand Down Expand Up @@ -408,7 +408,7 @@ jobs:
git config --system core.longpaths true
.github/build_windows.bat
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1-node16
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
Expand All @@ -420,7 +420,7 @@ jobs:
& "D:\a\amazon-kinesis-video-streams-producer-c\amazon-kinesis-video-streams-producer-c\build\tst\producer_test.exe" --gtest_filter="-ProducerFunctionalityTest.pressure_on_buffer_duration_fail_new_connection_at_token_rotation"

arm64-cross-compilation:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
env:
CC: aarch64-linux-gnu-gcc
CXX: aarch64-linux-gnu-g++
Expand All @@ -439,7 +439,7 @@ jobs:
make
file libcproducer.so
linux-aarch64-cross-compilation:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
env:
CC: aarch64-linux-gnu-gcc
CXX: aarch64-linux-gnu-g++
Expand All @@ -458,7 +458,7 @@ jobs:
make
file libcproducer.so
arm32-cross-compilation:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
env:
CC: arm-linux-gnueabi-gcc
CXX: arm-linux-gnueabi-g++
Expand All @@ -478,7 +478,7 @@ jobs:
file libcproducer.so

linux-build-gcc-static:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: Clone repository
uses: actions/checkout@v3
Expand Down
4 changes: 4 additions & 0 deletions CMake/Dependencies/libwebsockets-CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,16 @@ else()
set(LWS_WITH_MBEDTLS OFF)
endif()

# v3.2.3 of LWS does not support DISABLE_WERROR flag. Needed for Clang-14 due to build warnings
set(LWS_CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")

ExternalProject_Add(project_libwebsockets
GIT_REPOSITORY https://github.com/warmcat/libwebsockets.git
GIT_TAG v3.2.3
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/build
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX}
-DCMAKE_C_FLAGS=${LWS_CMAKE_C_FLAGS}
-DLWS_WITH_HTTP2=1
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DLWS_HAVE_HMAC_CTX_new=1
Expand Down
Loading