Skip to content

Commit 1e6fedf

Browse files
author
Vladyslav Goncharuk
committed
[ISSUE #194] Check that all builds are successful with dlt-viewer v2.25.0
Change description: - Update all CI/CD builds to fetch dlt-viewer of the version v2.25.0 - Update compatible version of the dlt-viewer in the installation_guide.md - Switch to the latest antlr 4.13.1 - Remove local copy of the antlr runtime. It should be downloaded from the github - Add installation of JAVA 11 to workflows - Remove trailing spaces from workflow definition files ---- Verification criteria: - Verified via the CI/CD - Verified via the local Linux build
1 parent abe21be commit 1e6fedf

17 files changed

+181
-85
lines changed

‎.github/workflows/build_clang_tidy_qt5.yml

+19-6
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ on:
88
workflow_dispatch:
99
inputs:
1010
branch:
11-
description: 'Target branch'
11+
description: 'Target branch'
1212
required: true
1313
default: 'master'
1414

1515
jobs:
1616
build_clang_tidy:
17-
17+
1818
runs-on: ubuntu-latest
1919

2020
steps:
@@ -31,12 +31,25 @@ jobs:
3131
sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install uuid-dev
3232
shell: bash
3333

34-
# Checkout dlt-viewer's revision v2.24.0
34+
# Install Java 11
35+
- name: Install Java 11
36+
uses: actions/setup-java@v4
37+
with:
38+
distribution: 'temurin'
39+
java-version: '11'
40+
41+
# Install cmake version 3.29.0-rc2
42+
- name: Setup cmake
43+
uses: jwlawson/actions-setup-cmake@v1.14
44+
with:
45+
cmake-version: '3.29.0-rc2'
46+
47+
# Checkout dlt-viewer's revision v2.25.0
3548
- name: Checkout of the dlt-viewer
3649
uses: actions/checkout@v3
3750
with:
3851
repository: GENIVI/dlt-viewer
39-
ref: ebb3c355bc0edf2b6c3be84452b8afa4d1a82641
52+
ref: v2.25.0
4053

4154
# Checkout project's revision, which is pushed
4255
- name: Checkout of the project
@@ -45,7 +58,7 @@ jobs:
4558
repository: svlad-90/${{ github.event.repository.name }}
4659
path: ./plugin/${{ github.event.repository.name }}
4760
ref: ${{ github.ref }}
48-
61+
4962
# Adjust dlt-viewer's CMake file to sub-include the plugin
5063
- name: Patch dlt-viewer's CMakeLists.txt
5164
run: echo 'add_subdirectory(${{ github.event.repository.name }}/dltmessageanalyzerplugin/src)' >> CMakeLists.txt
@@ -73,7 +86,7 @@ jobs:
7386
run: cmake ../${{ github.event.repository.name }} -DDMA_CLANG_TIDY_BUILD=true
7487
shell: bash
7588
working-directory: ../build
76-
89+
7790
# Build of the project with proceed on error
7891
- name: Make
7992
run: make -k -j8

‎.github/workflows/build_clang_tidy_qt6.yml

+19-6
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ on:
88
workflow_dispatch:
99
inputs:
1010
branch:
11-
description: 'Target branch'
11+
description: 'Target branch'
1212
required: true
1313
default: 'master'
1414

1515
jobs:
1616
build_clang_tidy:
17-
17+
1818
runs-on: ubuntu-latest
1919

2020
steps:
@@ -31,12 +31,25 @@ jobs:
3131
sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install uuid-dev
3232
shell: bash
3333

34-
# Checkout dlt-viewer's revision v2.24.0
34+
# Install Java 11
35+
- name: Install Java 11
36+
uses: actions/setup-java@v4
37+
with:
38+
distribution: 'temurin'
39+
java-version: '11'
40+
41+
# Install cmake version 3.29.0-rc2
42+
- name: Setup cmake
43+
uses: jwlawson/actions-setup-cmake@v1.14
44+
with:
45+
cmake-version: '3.29.0-rc2'
46+
47+
# Checkout dlt-viewer's revision v2.25.0
3548
- name: Checkout of the dlt-viewer
3649
uses: actions/checkout@v3
3750
with:
3851
repository: GENIVI/dlt-viewer
39-
ref: ebb3c355bc0edf2b6c3be84452b8afa4d1a82641
52+
ref: v2.25.0
4053

4154
# Checkout project's revision, which is pushed
4255
- name: Checkout of the project
@@ -45,7 +58,7 @@ jobs:
4558
repository: svlad-90/${{ github.event.repository.name }}
4659
path: ./plugin/${{ github.event.repository.name }}
4760
ref: ${{ github.ref }}
48-
61+
4962
# Adjust dlt-viewer's CMake file to sub-include the plugin
5063
- name: Patch dlt-viewer's CMakeLists.txt
5164
run: echo 'add_subdirectory(${{ github.event.repository.name }}/dltmessageanalyzerplugin/src)' >> CMakeLists.txt
@@ -74,7 +87,7 @@ jobs:
7487
run: cmake ../${{ github.event.repository.name }} -DDMA_CLANG_TIDY_BUILD=true
7588
shell: bash
7689
working-directory: ../build
77-
90+
7891
# Build of the project with proceed on error
7992
- name: Make
8093
run: make -k -j8

‎.github/workflows/build_linux_qt5.yml

+19-6
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ on:
88
workflow_dispatch:
99
inputs:
1010
branch:
11-
description: 'Target branch'
11+
description: 'Target branch'
1212
required: true
1313
default: 'master'
1414

1515
jobs:
1616
build_linux:
17-
17+
1818
runs-on: ubuntu-latest
1919

2020
steps:
@@ -26,12 +26,25 @@ jobs:
2626
sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install uuid-dev
2727
shell: bash
2828

29-
# Checkout dlt-viewer's revision v2.24.0
29+
# Install Java 11
30+
- name: Install Java 11
31+
uses: actions/setup-java@v4
32+
with:
33+
distribution: 'temurin'
34+
java-version: '11'
35+
36+
# Install cmake version 3.29.0-rc2
37+
- name: Setup cmake
38+
uses: jwlawson/actions-setup-cmake@v1.14
39+
with:
40+
cmake-version: '3.29.0-rc2'
41+
42+
# Checkout dlt-viewer's revision v2.25.0
3043
- name: Checkout of the dlt-viewer
3144
uses: actions/checkout@v3
3245
with:
3346
repository: GENIVI/dlt-viewer
34-
ref: ebb3c355bc0edf2b6c3be84452b8afa4d1a82641
47+
ref: v2.25.0
3548

3649
# Checkout project's revision, which is pushed
3750
- name: Checkout of the ${{ github.event.repository.name }}
@@ -40,7 +53,7 @@ jobs:
4053
repository: svlad-90/${{ github.event.repository.name }}
4154
path: ./plugin/${{ github.event.repository.name }}
4255
ref: ${{ github.ref }}
43-
56+
4457
# Adjust dlt-viewer's CMake file to sub-include the plugin
4558
- name: Patch dlt-viewer's CMakeLists.txt
4659
run: echo 'add_subdirectory(${{ github.event.repository.name }}/dltmessageanalyzerplugin/src)' >> CMakeLists.txt
@@ -68,7 +81,7 @@ jobs:
6881
run: cmake ../${{ github.event.repository.name }}
6982
shell: bash
7083
working-directory: ../build
71-
84+
7285
# Build of the project
7386
- name: Make
7487
run: make -j8

‎.github/workflows/build_linux_qt6.yml

+19-6
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ on:
88
workflow_dispatch:
99
inputs:
1010
branch:
11-
description: 'Target branch'
11+
description: 'Target branch'
1212
required: true
1313
default: 'master'
1414

1515
jobs:
1616
build_linux:
17-
17+
1818
runs-on: ubuntu-latest
1919

2020
steps:
@@ -26,12 +26,25 @@ jobs:
2626
sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install uuid-dev
2727
shell: bash
2828

29-
# Checkout dlt-viewer's revision v2.24.0
29+
# Install Java 11
30+
- name: Install Java 11
31+
uses: actions/setup-java@v4
32+
with:
33+
distribution: 'temurin'
34+
java-version: '11'
35+
36+
# Install cmake version 3.29.0-rc2
37+
- name: Setup cmake
38+
uses: jwlawson/actions-setup-cmake@v1.14
39+
with:
40+
cmake-version: '3.29.0-rc2'
41+
42+
# Checkout dlt-viewer's revision v2.25.0
3043
- name: Checkout of the dlt-viewer
3144
uses: actions/checkout@v3
3245
with:
3346
repository: GENIVI/dlt-viewer
34-
ref: ebb3c355bc0edf2b6c3be84452b8afa4d1a82641
47+
ref: v2.25.0
3548

3649
# Checkout project's revision, which is pushed
3750
- name: Checkout of the ${{ github.event.repository.name }}
@@ -40,7 +53,7 @@ jobs:
4053
repository: svlad-90/${{ github.event.repository.name }}
4154
path: ./plugin/${{ github.event.repository.name }}
4255
ref: ${{ github.ref }}
43-
56+
4457
# Adjust dlt-viewer's CMake file to sub-include the plugin
4558
- name: Patch dlt-viewer's CMakeLists.txt
4659
run: echo 'add_subdirectory(${{ github.event.repository.name }}/dltmessageanalyzerplugin/src)' >> CMakeLists.txt
@@ -69,7 +82,7 @@ jobs:
6982
run: cmake ../${{ github.event.repository.name }}
7083
shell: bash
7184
working-directory: ../build
72-
85+
7386
# Build of the project
7487
- name: Make
7588
run: make -j8

‎.github/workflows/build_windows_qt5.yml

+25-12
Original file line numberDiff line numberDiff line change
@@ -8,50 +8,63 @@ on:
88
workflow_dispatch:
99
inputs:
1010
branch:
11-
description: 'Target branch'
11+
description: 'Target branch'
1212
required: true
1313
default: 'master'
1414

1515
jobs:
1616
build_windows:
17-
17+
1818
runs-on: windows-latest
1919

2020
steps:
2121

2222
- uses: ilammy/msvc-dev-cmd@v1
23-
23+
2424
# Creation of the ..\downloads directory
2525
- name: Creation of the "..\downloads" directory
2626
run: mkdir ..\downloads
2727
shell: cmd
2828
working-directory: .\
29-
29+
3030
# Creation of the ..\tools directory
3131
- name: Creation of the "..\tools" directory
3232
run: mkdir ..\tools
3333
shell: cmd
3434
working-directory: .\
35-
35+
3636
# Installation of jom
3737
- name: Installation of the jom
3838
run: |
3939
Invoke-WebRequest http://download.qt.io/official_releases/jom/jom.zip -OutFile ..\downloads\jom.zip
40-
Expand-Archive '..\downloads\jom.zip' '..\tools\jom'
40+
Expand-Archive '..\downloads\jom.zip' '..\tools\jom'
4141
shell: powershell
42-
42+
4343
# Add jom to path
4444
- name: Add jom to path
4545
run: |
4646
echo "D:/a/${{ github.event.repository.name }}/tools/jom/" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
4747
shell: powershell
4848

49-
# Checkout dlt-viewer's revision v2.24.0
49+
# Install Java 11
50+
- name: Install Java 11
51+
uses: actions/setup-java@v4
52+
with:
53+
distribution: 'temurin'
54+
java-version: '11'
55+
56+
# Install cmake version 3.29.0-rc2
57+
- name: Setup cmake
58+
uses: jwlawson/actions-setup-cmake@v1.14
59+
with:
60+
cmake-version: '3.29.0-rc2'
61+
62+
# Checkout dlt-viewer's revision v2.25.0
5063
- name: Checkout of the dlt-viewer
5164
uses: actions/checkout@v3
5265
with:
5366
repository: GENIVI/dlt-viewer
54-
ref: ebb3c355bc0edf2b6c3be84452b8afa4d1a82641
67+
ref: v2.25.0
5568

5669
# Checkout project's revision, which is pushed
5770
- name: Checkout of the project
@@ -60,7 +73,7 @@ jobs:
6073
repository: svlad-90/${{ github.event.repository.name }}
6174
path: .\plugin\${{ github.event.repository.name }}
6275
ref: ${{ github.ref }}
63-
76+
6477
# Adjust dlt-viewer's plugin CMakeLists.txt file to sub-include the plugin
6578
- name: Patch dlt-viewer's plugin CMakeLists.txt
6679
run: Add-Content .\CMakeLists.txt "`nadd_subdirectory(${{ github.event.repository.name }}/dltmessageanalyzerplugin/src)"
@@ -89,14 +102,14 @@ jobs:
89102
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"
90103
shell: cmd
91104
working-directory: ..\build
92-
105+
93106
#List files in build folder
94107
- name: List files in build folder
95108
run: |
96109
dir
97110
shell: cmd
98111
working-directory: ..\build
99-
112+
100113
# Build of the project
101114
- name: Jom
102115
run: |

0 commit comments

Comments
 (0)