Skip to content

Commit c5c0991

Browse files
bramoosterhuisbramoosterhuis
authored
Merge branch 'main' into fix/CompositorBuffer--EventFrame-should-be-64bit-also-on-32bit
2 parents e688d9b + 23a3590 commit c5c0991

File tree

2 files changed

+81
-74
lines changed

2 files changed

+81
-74
lines changed

‎.github/workflows/Build ThunderLibraries on Linux.yml‎

Lines changed: 2 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -5,83 +5,11 @@ on:
55
branches: ["main"]
66
pull_request:
77
branches: ["main"]
8-
workflow_call:
98

109
jobs:
1110
Thunder:
12-
uses: rdkcentral/Thunder/.github/workflows/Build Thunder on Linux.yml@master
11+
uses: rdkcentral/Thunder/.github/workflows/Linux build template.yml@master
1312

1413
ThunderLibraries:
1514
needs: Thunder
16-
17-
runs-on: ubuntu-latest
18-
19-
strategy:
20-
matrix:
21-
build_type: [Debug, Release, MinSizeRel]
22-
23-
name: Build type - ${{matrix.build_type}}
24-
steps:
25-
- name: Install necessary packages
26-
uses: nick-fields/retry@v2
27-
with:
28-
timeout_minutes: 10
29-
max_attempts: 10
30-
command: |
31-
sudo gem install apt-spy2
32-
sudo apt-spy2 fix --commit --launchpad --country=US
33-
sudo apt-get update
34-
sudo apt install python3-pip
35-
pip install jsonref
36-
sudo apt install build-essential cmake ninja-build libusb-1.0-0-dev zlib1g-dev libssl-dev
37-
38-
- name: Checkout Thunder
39-
uses: actions/checkout@v3
40-
with:
41-
path: Thunder
42-
repository: rdkcentral/Thunder
43-
44-
- name: Download artifacts
45-
uses: actions/download-artifact@v3
46-
with:
47-
name: Thunder-${{matrix.build_type}}-artifact
48-
path: ${{matrix.build_type}}
49-
50-
- name: Unpack files
51-
run: |
52-
tar -xvzf ${{matrix.build_type}}/${{matrix.build_type}}.tar.gz
53-
rm ${{matrix.build_type}}/${{matrix.build_type}}.tar.gz
54-
55-
- name: Checkout ThunderLibraries
56-
uses: actions/checkout@v3
57-
with:
58-
path: ThunderLibraries
59-
repository: ${{github.repository_owner}}/ThunderLibraries
60-
61-
- name: Regex ThunderLibraries
62-
if: contains(github.event.pull_request.body, '[Options:')
63-
id: libs
64-
uses: AsasInnab/regex-action@v1
65-
with:
66-
regex_pattern: '(?<=\[Options:).*(?=\])'
67-
regex_flags: 'gim'
68-
search_string: ${{github.event.pull_request.body}}
69-
70-
- name: Build ThunderLibraries
71-
run: |
72-
cmake -G Ninja -S ThunderLibraries -B ${{matrix.build_type}}/build/ThunderLibraries \
73-
-DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Werror" \
74-
-DCMAKE_INSTALL_PREFIX="${{matrix.build_type}}/install/usr" \
75-
-DCMAKE_MODULE_PATH="${PWD}/${{matrix.build_type}}/install/usr/include/WPEFramework/Modules" \
76-
-DBROADCAST=ON \
77-
${{steps.libs.outputs.first_match}}
78-
cmake --build ${{matrix.build_type}}/build/ThunderLibraries --target install
79-
80-
- name: Tar files
81-
run: tar -czvf ${{matrix.build_type}}.tar.gz ${{matrix.build_type}}
82-
83-
- name: Upload
84-
uses: actions/upload-artifact@v3
85-
with:
86-
name: ThunderLibraries-${{matrix.build_type}}-artifact
87-
path: ${{matrix.build_type}}.tar.gz
15+
uses: WebPlatformForEmbedded/ThunderLibraries/.github/workflows/Linux build template.yml@main

‎.github/workflows/Linux build template.yml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
name: Build ThunderLibraries on Linux
2+
3+
on:
4+
workflow_call:
5+
6+
jobs:
7+
ThunderLibraries:
8+
9+
runs-on: ubuntu-latest
10+
11+
strategy:
12+
matrix:
13+
build_type: [Debug, Release, MinSizeRel]
14+
15+
name: Build type - ${{matrix.build_type}}
16+
steps:
17+
- name: Install necessary packages
18+
uses: nick-fields/retry@v2
19+
with:
20+
timeout_minutes: 10
21+
max_attempts: 10
22+
command: |
23+
sudo gem install apt-spy2
24+
sudo apt-spy2 fix --commit --launchpad --country=US
25+
sudo apt-get update
26+
sudo apt install python3-pip
27+
pip install jsonref
28+
sudo apt install build-essential cmake ninja-build libusb-1.0-0-dev zlib1g-dev libssl-dev
29+
30+
- name: Checkout Thunder
31+
uses: actions/checkout@v3
32+
with:
33+
path: Thunder
34+
repository: rdkcentral/Thunder
35+
36+
- name: Download artifacts
37+
uses: actions/download-artifact@v3
38+
with:
39+
name: Thunder-${{matrix.build_type}}-artifact
40+
path: ${{matrix.build_type}}
41+
42+
- name: Unpack files
43+
run: |
44+
tar -xvzf ${{matrix.build_type}}/${{matrix.build_type}}.tar.gz
45+
rm ${{matrix.build_type}}/${{matrix.build_type}}.tar.gz
46+
47+
- name: Checkout ThunderLibraries
48+
uses: actions/checkout@v3
49+
with:
50+
path: ThunderLibraries
51+
repository: WebPlatformForEmbedded/ThunderLibraries
52+
53+
- name: Regex ThunderLibraries
54+
if: contains(github.event.pull_request.body, '[Options:')
55+
id: libs
56+
uses: AsasInnab/regex-action@v1
57+
with:
58+
regex_pattern: '(?<=\[Options:).*(?=\])'
59+
regex_flags: 'gim'
60+
search_string: ${{github.event.pull_request.body}}
61+
62+
- name: Build ThunderLibraries
63+
run: |
64+
cmake -G Ninja -S ThunderLibraries -B ${{matrix.build_type}}/build/ThunderLibraries \
65+
-DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Werror" \
66+
-DCMAKE_INSTALL_PREFIX="${{matrix.build_type}}/install/usr" \
67+
-DCMAKE_MODULE_PATH="${PWD}/${{matrix.build_type}}/install/usr/include/WPEFramework/Modules" \
68+
-DBROADCAST=ON \
69+
${{steps.libs.outputs.first_match}}
70+
cmake --build ${{matrix.build_type}}/build/ThunderLibraries --target install
71+
72+
- name: Tar files
73+
run: tar -czvf ${{matrix.build_type}}.tar.gz ${{matrix.build_type}}
74+
75+
- name: Upload
76+
uses: actions/upload-artifact@v3
77+
with:
78+
name: ThunderLibraries-${{matrix.build_type}}-artifact
79+
path: ${{matrix.build_type}}.tar.gz

0 commit comments

Comments
 (0)