Skip to content

Commit ba18e35

Browse files
disa6302disa6302
committed
Enable all CI, fix instance label for ubuntu instances
1 parent 19daa51 commit ba18e35

File tree

5 files changed

+86
-94
lines changed

5 files changed

+86
-94
lines changed

‎.github/build_windows_openssl_old.bat

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
22
mkdir build
33
cd build
4+
cmd.exe /c cmake -G "NMake Makefiles" ..
45
cmake -G "NMake Makefiles" -DBUILD_TEST=TRUE -DENABLE_AWS_SDK_IN_TESTS=OFF -DBUILD_LEGACY_OPENSSL_VERSION=ON -DEXT_PTHREAD_INCLUDE_DIR="C:/tools/pthreads-w32-2-9-1-release/Pre-built.2/include/" -DEXT_PTHREAD_LIBRARIES="C:/tools/pthreads-w32-2-9-1-release/Pre-built.2/lib/x64/libpthreadGC2.a" ..
56
nmake

‎.github/workflows/ci.yml

+49-52
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: macos-latest
1515
steps:
1616
- name: Clone repository
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
- name: Install clang-format
1919
run: |
2020
brew install clang-format
@@ -33,9 +33,9 @@ jobs:
3333
contents: read
3434
steps:
3535
- name: Clone repository
36-
uses: actions/checkout@v3
36+
uses: actions/checkout@v4
3737
- name: Configure AWS Credentials
38-
uses: aws-actions/configure-aws-credentials@v2
38+
uses: aws-actions/configure-aws-credentials@v4
3939
with:
4040
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
4141
aws-region: ${{ secrets.AWS_REGION }}
@@ -59,9 +59,9 @@ jobs:
5959
contents: read
6060
steps:
6161
- name: Clone repository
62-
uses: actions/checkout@v3
62+
uses: actions/checkout@v4
6363
- name: Configure AWS Credentials
64-
uses: aws-actions/configure-aws-credentials@v2
64+
uses: aws-actions/configure-aws-credentials@v4
6565
with:
6666
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
6767
aws-region: ${{ secrets.AWS_REGION }}
@@ -85,9 +85,9 @@ jobs:
8585
contents: read
8686
steps:
8787
- name: Clone repository
88-
uses: actions/checkout@v3
88+
uses: actions/checkout@v4
8989
- name: Configure AWS Credentials
90-
uses: aws-actions/configure-aws-credentials@v2
90+
uses: aws-actions/configure-aws-credentials@v4
9191
with:
9292
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
9393
aws-region: ${{ secrets.AWS_REGION }}
@@ -109,9 +109,9 @@ jobs:
109109
contents: read
110110
steps:
111111
- name: Clone repository
112-
uses: actions/checkout@v3
112+
uses: actions/checkout@v4
113113
- name: Configure AWS Credentials
114-
uses: aws-actions/configure-aws-credentials@v2
114+
uses: aws-actions/configure-aws-credentials@v4
115115
with:
116116
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
117117
aws-region: ${{ secrets.AWS_REGION }}
@@ -134,9 +134,9 @@ jobs:
134134
contents: read
135135
steps:
136136
- name: Clone repository
137-
uses: actions/checkout@v3
137+
uses: actions/checkout@v4
138138
- name: Configure AWS Credentials
139-
uses: aws-actions/configure-aws-credentials@v2
139+
uses: aws-actions/configure-aws-credentials@v4
140140
with:
141141
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
142142
aws-region: ${{ secrets.AWS_REGION }}
@@ -159,9 +159,9 @@ jobs:
159159
contents: read
160160
steps:
161161
- name: Clone repository
162-
uses: actions/checkout@v3
162+
uses: actions/checkout@v4
163163
- name: Configure AWS Credentials
164-
uses: aws-actions/configure-aws-credentials@v2
164+
uses: aws-actions/configure-aws-credentials@v4
165165
with:
166166
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
167167
aws-region: ${{ secrets.AWS_REGION }}
@@ -187,9 +187,9 @@ jobs:
187187
contents: read
188188
steps:
189189
- name: Clone repository
190-
uses: actions/checkout@v3
190+
uses: actions/checkout@v4
191191
- name: Configure AWS Credentials
192-
uses: aws-actions/configure-aws-credentials@v2
192+
uses: aws-actions/configure-aws-credentials@v4
193193
with:
194194
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
195195
aws-region: ${{ secrets.AWS_REGION }}
@@ -222,9 +222,9 @@ jobs:
222222
contents: read
223223
steps:
224224
- name: Clone repository
225-
uses: actions/checkout@v3
225+
uses: actions/checkout@v4
226226
- name: Configure AWS Credentials
227-
uses: aws-actions/configure-aws-credentials@v2
227+
uses: aws-actions/configure-aws-credentials@v4
228228
with:
229229
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
230230
aws-region: ${{ secrets.AWS_REGION }}
@@ -253,7 +253,7 @@ jobs:
253253
# AWS_KVS_LOG_LEVEL: 2
254254
# steps:
255255
# - name: Clone repository
256-
# uses: actions/checkout@v3
256+
# uses: actions/checkout@v4
257257
# - name: Install dependencies
258258
# run: |
259259
# sudo apt clean && sudo apt update
@@ -278,9 +278,9 @@ jobs:
278278
contents: read
279279
steps:
280280
- name: Clone repository
281-
uses: actions/checkout@v3
281+
uses: actions/checkout@v4
282282
- name: Configure AWS Credentials
283-
uses: aws-actions/configure-aws-credentials@v2
283+
uses: aws-actions/configure-aws-credentials@v4
284284
with:
285285
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
286286
aws-region: ${{ secrets.AWS_REGION }}
@@ -310,9 +310,9 @@ jobs:
310310
contents: read
311311
steps:
312312
- name: Clone repository
313-
uses: actions/checkout@v3
313+
uses: actions/checkout@v4
314314
- name: Configure AWS Credentials
315-
uses: aws-actions/configure-aws-credentials@v2
315+
uses: aws-actions/configure-aws-credentials@v4
316316
with:
317317
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
318318
aws-region: ${{ secrets.AWS_REGION }}
@@ -351,7 +351,7 @@ jobs:
351351
contents: read
352352
steps:
353353
- name: Clone repository
354-
uses: actions/checkout@v3
354+
uses: actions/checkout@v4
355355
- name: Install dependencies
356356
run: |
357357
apk update
@@ -371,9 +371,9 @@ jobs:
371371
contents: read
372372
steps:
373373
- name: Clone repository
374-
uses: actions/checkout@v3
374+
uses: actions/checkout@v4
375375
- name: Configure AWS Credentials
376-
uses: aws-actions/configure-aws-credentials@v2
376+
uses: aws-actions/configure-aws-credentials@v4
377377
with:
378378
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
379379
aws-region: ${{ secrets.AWS_REGION }}
@@ -407,9 +407,9 @@ jobs:
407407
contents: read
408408
steps:
409409
- name: Clone repository
410-
uses: actions/checkout@v3
410+
uses: actions/checkout@v4
411411
- name: Configure AWS Credentials
412-
uses: aws-actions/configure-aws-credentials@v2
412+
uses: aws-actions/configure-aws-credentials@v4
413413
with:
414414
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
415415
aws-region: ${{ secrets.AWS_REGION }}
@@ -443,9 +443,9 @@ jobs:
443443
contents: read
444444
steps:
445445
- name: Clone repository
446-
uses: actions/checkout@v3
446+
uses: actions/checkout@v4
447447
- name: Configure AWS Credentials
448-
uses: aws-actions/configure-aws-credentials@v2
448+
uses: aws-actions/configure-aws-credentials@v4
449449
with:
450450
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
451451
aws-region: ${{ secrets.AWS_REGION }}
@@ -467,7 +467,7 @@ jobs:
467467
timeout --signal=SIGABRT 60m ./tst/webrtc_client_test
468468
sample-check:
469469
if: github.repository == 'awslabs/amazon-kinesis-video-streams-webrtc-sdk-c'
470-
runs-on: ubuntu-latest
470+
runs-on: ubuntu-20.04
471471
env:
472472
AWS_KVS_LOG_LEVEL: 2
473473
permissions:
@@ -481,28 +481,26 @@ jobs:
481481
with:
482482
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
483483
aws-region: ${{ secrets.AWS_REGION }}
484-
role-duration-seconds: 10800
485484
- name: Build repository
486485
run: |
487486
sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
488487
mkdir build && cd build
489488
cmake ..
490489
make
491-
- name: Sample check
492-
run: |
490+
cd ..
493491
./scripts/check-sample.sh
494492
ubuntu-os-build:
495-
runs-on: ubuntu-20.04
493+
runs-on: ubuntu-latest
496494
env:
497495
AWS_KVS_LOG_LEVEL: 2
498496
permissions:
499497
id-token: write
500498
contents: read
501499
steps:
502500
- name: Clone repository
503-
uses: actions/checkout@v3
501+
uses: actions/checkout@v4
504502
- name: Configure AWS Credentials
505-
uses: aws-actions/configure-aws-credentials@v2
503+
uses: aws-actions/configure-aws-credentials@v4
506504
with:
507505
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
508506
aws-region: ${{ secrets.AWS_REGION }}
@@ -522,31 +520,30 @@ jobs:
522520
cd build
523521
timeout --signal=SIGABRT 60m ./tst/webrtc_client_test
524522
ubuntu-os-build-openssl-old:
525-
runs-on: ubuntu-latest
523+
runs-on: ubuntu-20.04
526524
env:
527525
AWS_KVS_LOG_LEVEL: 2
528526
permissions:
529527
id-token: write
530528
contents: read
531529
steps:
532530
- name: Clone repository
533-
uses: actions/checkout@v3
531+
uses: actions/checkout@v4
534532
- name: Configure AWS Credentials
535-
uses: aws-actions/configure-aws-credentials@v2
533+
uses: aws-actions/configure-aws-credentials@v4
536534
with:
537535
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
538536
aws-region: ${{ secrets.AWS_REGION }}
539537
- name: Install dependencies
540538
run: |
541539
sudo apt clean && sudo apt update
542540
sudo apt-get -y install libcurl4-openssl-dev
543-
openssl version
544541
- name: Build repository
545542
run: |
546543
# TODO: Remove the following line. This is only a workaround for enabling IPv6, https://github.com/travis-ci/travis-ci/issues/8891.
547544
sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
548545
mkdir build && cd build
549-
cmake .. -DBUILD_TEST=TRUE -DBUILD_OLD_OPENSSL_VERSION=ON -DENABLE_AWS_SDK_IN_TESTS=OFF
546+
cmake .. -DBUILD_TEST=TRUE -DBUILD_OLD_OPENSSL_VERSION=ON
550547
make
551548
- name: Run tests
552549
run: |
@@ -561,9 +558,9 @@ jobs:
561558
contents: read
562559
steps:
563560
- name: Clone repository
564-
uses: actions/checkout@v3
561+
uses: actions/checkout@v4
565562
- name: Configure AWS Credentials
566-
uses: aws-actions/configure-aws-credentials@v2
563+
uses: aws-actions/configure-aws-credentials@v4
567564
with:
568565
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
569566
aws-region: ${{ secrets.AWS_REGION }}
@@ -614,9 +611,9 @@ jobs:
614611
contents: read
615612
steps:
616613
- name: Clone repository
617-
uses: actions/checkout@v3
614+
uses: actions/checkout@v4
618615
- name: Configure AWS Credentials
619-
uses: aws-actions/configure-aws-credentials@v2
616+
uses: aws-actions/configure-aws-credentials@v4
620617
with:
621618
role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
622619
aws-region: ${{ secrets.AWS_REGION }}
@@ -665,7 +662,7 @@ jobs:
665662
# AWS_KVS_LOG_LEVEL: 7
666663
# steps:
667664
# - name: Clone repository
668-
# uses: actions/checkout@v3
665+
# uses: actions/checkout@v4
669666
# - name: Move cloned repo
670667
# shell: powershell
671668
# run: |
@@ -698,7 +695,7 @@ jobs:
698695
sudo apt clean && sudo apt update
699696
sudo apt-get -y install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu
700697
- name: Clone repository
701-
uses: actions/checkout@v3
698+
uses: actions/checkout@v4
702699
- name: Build Repository
703700
run: |
704701
sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
@@ -716,7 +713,7 @@ jobs:
716713
sudo apt clean && sudo apt update
717714
sudo apt-get -y install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu
718715
- name: Clone repository
719-
uses: actions/checkout@v3
716+
uses: actions/checkout@v4
720717
- name: Build Repository
721718
run: |
722719
sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
@@ -734,7 +731,7 @@ jobs:
734731
sudo apt clean && sudo apt update
735732
sudo apt-get -y install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu
736733
- name: Clone repository
737-
uses: actions/checkout@v3
734+
uses: actions/checkout@v4
738735
- name: Build Repository
739736
run: |
740737
sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
@@ -752,7 +749,7 @@ jobs:
752749
sudo apt clean && sudo apt update
753750
sudo apt-get -y install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu
754751
- name: Clone repository
755-
uses: actions/checkout@v3
752+
uses: actions/checkout@v4
756753
- name: Build Repository
757754
run: |
758755
sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
@@ -770,7 +767,7 @@ jobs:
770767
sudo apt clean && sudo apt update
771768
sudo apt-get -y install gcc-arm-linux-gnueabi g++-arm-linux-gnueabi binutils-arm-linux-gnueabi
772769
- name: Clone repository
773-
uses: actions/checkout@v3
770+
uses: actions/checkout@v4
774771
- name: Build Repository
775772
run: |
776773
sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
@@ -788,7 +785,7 @@ jobs:
788785
sudo apt clean && sudo apt update
789786
sudo apt-get -y install gcc-arm-linux-gnueabi g++-arm-linux-gnueabi binutils-arm-linux-gnueabi
790787
- name: Clone repository
791-
uses: actions/checkout@v3
788+
uses: actions/checkout@v4
792789
- name: Build Repository
793790
run: |
794791
sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'

‎.github/workflows/codecov.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
- master
1111
jobs:
1212
linux-gcc-codecov:
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-latest
1414
env:
1515
AWS_KVS_LOG_LEVEL: 2
1616
permissions:

0 commit comments

Comments
 (0)