Skip to content

Commit 4628c22

Browse files
svlad-90svlad-90
authored
Merge pull request #171 from svlad-90/dev/vladyslav-goncharuk/ISSUE-170
[ISSUE #170][General] CI/CD, documentation updates
2 parents 61649dc + fa13706 commit 4628c22

File tree

13 files changed

+369
-110
lines changed

13 files changed

+369
-110
lines changed

.github/workflows/build_clang_tidy.yml renamed to .github/workflows/build_clang_tidy_qt5.yml

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build clang-tidy
1+
name: Build clang-tidy Qt5
22

33
on:
44
push:
@@ -31,34 +31,16 @@ jobs:
3131
sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install uuid-dev
3232
shell: bash
3333

34-
# Cache Qt
35-
- name: Cache Qt
36-
id: cache-qt
37-
uses: actions/cache@v1
38-
with:
39-
path: ../Qt
40-
key: ${{ runner.os }}-QtCache
41-
42-
# Install Qt
43-
- name: Install Qt
44-
uses: jurplel/install-qt-action@v2
45-
with:
46-
version: 5.15.0
47-
target: desktop
48-
host: linux
49-
dir: ../Qt
50-
cached: ${{ steps.cache-qt.outputs.cache-hit }}
51-
5234
# Checkout dlt-viewer's revision v2.24.0
5335
- name: Checkout of the dlt-viewer
54-
uses: actions/checkout@v2
36+
uses: actions/checkout@v3
5537
with:
5638
repository: GENIVI/dlt-viewer
5739
ref: ebb3c355bc0edf2b6c3be84452b8afa4d1a82641
5840

5941
# Checkout project's revision, which is pushed
6042
- name: Checkout of the project
61-
uses: actions/checkout@v2
43+
uses: actions/checkout@v3
6244
with:
6345
repository: svlad-90/${{ github.event.repository.name }}
6446
path: ./plugin/${{ github.event.repository.name }}
@@ -70,6 +52,16 @@ jobs:
7052
shell: bash
7153
working-directory: ./plugin
7254

55+
# Install Qt5
56+
- name: Install Qt5
57+
uses: jurplel/install-qt-action@v3
58+
with:
59+
version: 5.15.0
60+
target: desktop
61+
host: linux
62+
dir: ${{ github.workspace }}/Qt5
63+
cache: true
64+
7365
# Create build directory
7466
- name: Creation of the "../build" directory
7567
run: mkdir ../build

‎.github/workflows/build_clang_tidy_qt6.yml‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
name: Build clang-tidy Qt6
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
workflow_dispatch:
9+
inputs:
10+
branch:
11+
description: 'Target branch'
12+
required: true
13+
default: 'master'
14+
15+
jobs:
16+
build_clang_tidy:
17+
18+
runs-on: ubuntu-latest
19+
20+
steps:
21+
22+
# Install clang-tidy
23+
- name: Install clang-tidy
24+
run: sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install clang-tidy
25+
shell: bash
26+
27+
# Install uuid-dev
28+
- name: Install uuid-dev
29+
run: |
30+
sudo apt update
31+
sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install uuid-dev
32+
shell: bash
33+
34+
# Checkout dlt-viewer's revision v2.24.0
35+
- name: Checkout of the dlt-viewer
36+
uses: actions/checkout@v3
37+
with:
38+
repository: GENIVI/dlt-viewer
39+
ref: ebb3c355bc0edf2b6c3be84452b8afa4d1a82641
40+
41+
# Checkout project's revision, which is pushed
42+
- name: Checkout of the project
43+
uses: actions/checkout@v3
44+
with:
45+
repository: svlad-90/${{ github.event.repository.name }}
46+
path: ./plugin/${{ github.event.repository.name }}
47+
ref: ${{ github.ref }}
48+
49+
# Adjust dlt-viewer's CMake file to sub-include the plugin
50+
- name: Patch dlt-viewer's CMakeLists.txt
51+
run: echo 'add_subdirectory(${{ github.event.repository.name }}/dltmessageanalyzerplugin/src)' >> CMakeLists.txt
52+
shell: bash
53+
working-directory: ./plugin
54+
55+
# Install Qt6
56+
- name: Install Qt6
57+
uses: jurplel/install-qt-action@v3
58+
with:
59+
version: 6.5.0
60+
target: desktop
61+
host: linux
62+
dir: ${{ github.workspace }}/Qt6
63+
cache: true
64+
modules: 'qtserialport'
65+
66+
# Create build directory
67+
- name: Creation of the "../build" directory
68+
run: mkdir ../build
69+
shell: bash
70+
working-directory: ./
71+
72+
# CMake execution
73+
- name: CMake with clang-tidy
74+
run: cmake ../${{ github.event.repository.name }} -DDMA_CLANG_TIDY_BUILD=true
75+
shell: bash
76+
working-directory: ../build
77+
78+
# Build of the project with proceed on error
79+
- name: Make
80+
run: make -k -j8
81+
shell: bash
82+
working-directory: ../build

.github/workflows/build_linux.yml renamed to .github/workflows/build_linux_qt5.yml

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build linux
1+
name: Build linux Qt5
22

33
on:
44
push:
@@ -26,34 +26,16 @@ jobs:
2626
sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install uuid-dev
2727
shell: bash
2828

29-
# Cache Qt
30-
- name: Cache Qt
31-
id: cache-qt
32-
uses: actions/cache@v1
33-
with:
34-
path: ../Qt
35-
key: ${{ runner.os }}-QtCache
36-
37-
# Install Qt
38-
- name: Install Qt
39-
uses: jurplel/install-qt-action@v2
40-
with:
41-
version: 5.15.0
42-
target: desktop
43-
host: linux
44-
dir: ../Qt
45-
cached: ${{ steps.cache-qt.outputs.cache-hit }}
46-
4729
# Checkout dlt-viewer's revision v2.24.0
4830
- name: Checkout of the dlt-viewer
49-
uses: actions/checkout@v2
31+
uses: actions/checkout@v3
5032
with:
5133
repository: GENIVI/dlt-viewer
5234
ref: ebb3c355bc0edf2b6c3be84452b8afa4d1a82641
5335

5436
# Checkout project's revision, which is pushed
5537
- name: Checkout of the ${{ github.event.repository.name }}
56-
uses: actions/checkout@v2
38+
uses: actions/checkout@v3
5739
with:
5840
repository: svlad-90/${{ github.event.repository.name }}
5941
path: ./plugin/${{ github.event.repository.name }}
@@ -65,6 +47,16 @@ jobs:
6547
shell: bash
6648
working-directory: ./plugin
6749

50+
# Install Qt5
51+
- name: Install Qt5
52+
uses: jurplel/install-qt-action@v3
53+
with:
54+
version: 5.15.0
55+
target: desktop
56+
host: linux
57+
dir: ${{ github.workspace }}/Qt5
58+
cache: true
59+
6860
# Create build directory
6961
- name: Creation of the "../build" directory
7062
run: mkdir ../build

‎.github/workflows/build_linux_qt6.yml‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
name: Build linux Qt6
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
workflow_dispatch:
9+
inputs:
10+
branch:
11+
description: 'Target branch'
12+
required: true
13+
default: 'master'
14+
15+
jobs:
16+
build_linux:
17+
18+
runs-on: ubuntu-latest
19+
20+
steps:
21+
22+
# Install uuid-dev
23+
- name: Install uuid-dev
24+
run: |
25+
sudo apt update
26+
sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install uuid-dev
27+
shell: bash
28+
29+
# Checkout dlt-viewer's revision v2.24.0
30+
- name: Checkout of the dlt-viewer
31+
uses: actions/checkout@v3
32+
with:
33+
repository: GENIVI/dlt-viewer
34+
ref: ebb3c355bc0edf2b6c3be84452b8afa4d1a82641
35+
36+
# Checkout project's revision, which is pushed
37+
- name: Checkout of the ${{ github.event.repository.name }}
38+
uses: actions/checkout@v3
39+
with:
40+
repository: svlad-90/${{ github.event.repository.name }}
41+
path: ./plugin/${{ github.event.repository.name }}
42+
ref: ${{ github.ref }}
43+
44+
# Adjust dlt-viewer's CMake file to sub-include the plugin
45+
- name: Patch dlt-viewer's CMakeLists.txt
46+
run: echo 'add_subdirectory(${{ github.event.repository.name }}/dltmessageanalyzerplugin/src)' >> CMakeLists.txt
47+
shell: bash
48+
working-directory: ./plugin
49+
50+
# Install Qt6
51+
- name: Install Qt6
52+
uses: jurplel/install-qt-action@v3
53+
with:
54+
version: 6.5.0
55+
target: desktop
56+
host: linux
57+
dir: ${{ github.workspace }}/Qt6
58+
cache: true
59+
modules: 'qtserialport'
60+
61+
# Create build directory
62+
- name: Creation of the "../build" directory
63+
run: mkdir ../build
64+
shell: bash
65+
working-directory: ./
66+
67+
# CMake execution
68+
- name: CMake
69+
run: cmake ../${{ github.event.repository.name }}
70+
shell: bash
71+
working-directory: ../build
72+
73+
# Build of the project
74+
- name: Make
75+
run: make -j8
76+
shell: bash
77+
working-directory: ../build

‎.github/workflows/build_update_repo_size.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
# Checkout project's revision, which was pushed
2828
- name: Checkout of the project
29-
uses: actions/checkout@v2
29+
uses: actions/checkout@v3
3030
with:
3131
repository: svlad-90/${{ github.event.repository.name }}
3232
path: ./

.github/workflows/build_windows.yml renamed to .github/workflows/build_windows_qt5.yml

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build windows
1+
name: Build windows Qt5
22

33
on:
44
push:
@@ -20,24 +20,6 @@ jobs:
2020
steps:
2121

2222
- uses: ilammy/msvc-dev-cmd@v1
23-
24-
# Caching the Qt
25-
- name: Cache Qt
26-
id: cache-qt
27-
uses: actions/cache@v1
28-
with:
29-
path: ..\Qt
30-
key: ${{ runner.os }}-QtCache
31-
32-
# Installation of the Qt
33-
- name: Install Qt
34-
uses: jurplel/install-qt-action@v2
35-
with:
36-
version: 5.15.0
37-
target: desktop
38-
host: windows
39-
dir: ..\Qt
40-
cached: ${{ steps.cache-qt.outputs.cache-hit }}
4123

4224
# Creation of the ..\downloads directory
4325
- name: Creation of the "..\downloads" directory
@@ -66,14 +48,14 @@ jobs:
6648

6749
# Checkout dlt-viewer's revision v2.24.0
6850
- name: Checkout of the dlt-viewer
69-
uses: actions/checkout@v2
51+
uses: actions/checkout@v3
7052
with:
7153
repository: GENIVI/dlt-viewer
7254
ref: ebb3c355bc0edf2b6c3be84452b8afa4d1a82641
7355

7456
# Checkout project's revision, which is pushed
7557
- name: Checkout of the project
76-
uses: actions/checkout@v2
58+
uses: actions/checkout@v3
7759
with:
7860
repository: svlad-90/${{ github.event.repository.name }}
7961
path: .\plugin\${{ github.event.repository.name }}
@@ -85,6 +67,16 @@ jobs:
8567
shell: powershell
8668
working-directory: .\plugin
8769

70+
# Install Qt5
71+
- name: Install Qt5
72+
uses: jurplel/install-qt-action@v3
73+
with:
74+
version: 5.15.0
75+
target: desktop
76+
host: windows
77+
dir: ${{ github.workspace }}\Qt5
78+
cache: true
79+
8880
# Create build directory
8981
- name: Creation of the ".\build" directory
9082
run: mkdir ..\build
@@ -94,7 +86,7 @@ jobs:
9486
#CMake for dlt-viewer, including the DLT-Message_analyzer plugin
9587
- name: CMake
9688
run: |
97-
cmake ..\${{ github.event.repository.name }}\ "-GCodeBlocks - NMake Makefiles JOM" "-DCMAKE_BUILD_TYPE:STRING=Release" "-DCMAKE_PREFIX_PATH:STRING=../Qt/Qt/5.15.0/msvc2019_64" "-DQT_QMAKE_EXECUTABLE:STRING=../Qt/Qt/5.15.0/msvc2019_64/bin/qmake.exe"
89+
cmake ..\${{ github.event.repository.name }}\ "-GCodeBlocks - NMake Makefiles JOM" "-DCMAKE_BUILD_TYPE:STRING=Release" "-DCMAKE_PREFIX_PATH:STRING=${{ github.workspace }}/Qt5/Qt/5.15.0/msvc2019_64" "-DQT_QMAKE_EXECUTABLE:STRING=${{ github.workspace }}/Qt5/Qt/5.15.0/msvc2019_64/bin/qmake.exe"
9890
shell: cmd
9991
working-directory: ..\build
10092

0 commit comments

Comments
 (0)