[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 GitHub workflows - Add installation of the CMake v3.24.x to GitHub workflows - Add the JAVA SE 11 antlr4 build dependency to the thirdparty_deps.md - Remove trailing spaces from workflow definition files ---- Verification criteria: - Verified via the CI/CD - Verified via the local Linux build
svlad-90 · Feb 25, 2024 · 7a85e3f · 7a85e3f
1 parent abe21be
commit 7a85e3f
Show file tree

Hide file tree

Showing 18 changed files with 183 additions and 85 deletions.
diff --git a/.github/workflows/build_clang_tidy_qt5.yml b/.github/workflows/build_clang_tidy_qt5.yml
@@ -8,13 +8,13 @@ on:
   workflow_dispatch:
     inputs:
       branch:
-        description: 'Target branch'     
+        description: 'Target branch'
         required: true
         default: 'master'
 
 jobs:
   build_clang_tidy:
-    
+
     runs-on: ubuntu-latest
 
     steps:
@@ -31,12 +31,25 @@ jobs:
            sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install uuid-dev
       shell: bash
 
-    # Checkout dlt-viewer's revision v2.24.0
+    # Install Java 11
+    - name: Install Java 11
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '11'
+
+    # Install cmake version v3.24.x
+    - name: Setup cmake
+      uses: jwlawson/[email protected]
+      with:
+        cmake-version: 'v3.24.x'
+
+    # Checkout dlt-viewer's revision v2.25.0
     - name: Checkout of the dlt-viewer
       uses: actions/checkout@v3
       with:
         repository: GENIVI/dlt-viewer
-        ref: ebb3c355bc0edf2b6c3be84452b8afa4d1a82641
+        ref: v2.25.0
 
     # Checkout project's revision, which is pushed
     - name: Checkout of the project
@@ -45,7 +58,7 @@ jobs:
         repository: svlad-90/${{ github.event.repository.name }}
         path: ./plugin/${{ github.event.repository.name }}
         ref: ${{ github.ref }}
-        
+
     # Adjust dlt-viewer's CMake file to sub-include the plugin
     - name: Patch dlt-viewer's CMakeLists.txt
       run: echo 'add_subdirectory(${{ github.event.repository.name }}/dltmessageanalyzerplugin/src)' >> CMakeLists.txt
@@ -73,7 +86,7 @@ jobs:
       run: cmake ../${{ github.event.repository.name }} -DDMA_CLANG_TIDY_BUILD=true
       shell: bash
       working-directory: ../build
-    
+
     # Build of the project with proceed on error
     - name: Make
       run: make -k -j8

diff --git a/.github/workflows/build_clang_tidy_qt6.yml b/.github/workflows/build_clang_tidy_qt6.yml
@@ -8,13 +8,13 @@ on:
   workflow_dispatch:
     inputs:
       branch:
-        description: 'Target branch'     
+        description: 'Target branch'
         required: true
         default: 'master'
 
 jobs:
   build_clang_tidy:
-    
+
     runs-on: ubuntu-latest
 
     steps:
@@ -31,12 +31,25 @@ jobs:
            sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install uuid-dev
       shell: bash
 
-    # Checkout dlt-viewer's revision v2.24.0
+    # Install Java 11
+    - name: Install Java 11
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '11'
+
+    # Install cmake version v3.24.x
+    - name: Setup cmake
+      uses: jwlawson/[email protected]
+      with:
+        cmake-version: 'v3.24.x'
+
+    # Checkout dlt-viewer's revision v2.25.0
     - name: Checkout of the dlt-viewer
       uses: actions/checkout@v3
       with:
         repository: GENIVI/dlt-viewer
-        ref: ebb3c355bc0edf2b6c3be84452b8afa4d1a82641
+        ref: v2.25.0
 
     # Checkout project's revision, which is pushed
     - name: Checkout of the project
@@ -45,7 +58,7 @@ jobs:
         repository: svlad-90/${{ github.event.repository.name }}
         path: ./plugin/${{ github.event.repository.name }}
         ref: ${{ github.ref }}
-        
+
     # Adjust dlt-viewer's CMake file to sub-include the plugin
     - name: Patch dlt-viewer's CMakeLists.txt
       run: echo 'add_subdirectory(${{ github.event.repository.name }}/dltmessageanalyzerplugin/src)' >> CMakeLists.txt
@@ -74,7 +87,7 @@ jobs:
       run: cmake ../${{ github.event.repository.name }} -DDMA_CLANG_TIDY_BUILD=true
       shell: bash
       working-directory: ../build
-    
+
     # Build of the project with proceed on error
     - name: Make
       run: make -k -j8

diff --git a/.github/workflows/build_linux_qt5.yml b/.github/workflows/build_linux_qt5.yml
@@ -8,13 +8,13 @@ on:
   workflow_dispatch:
     inputs:
       branch:
-        description: 'Target branch'     
+        description: 'Target branch'
         required: true
         default: 'master'
 
 jobs:
   build_linux:
-    
+
     runs-on: ubuntu-latest
 
     steps:
@@ -26,12 +26,25 @@ jobs:
            sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install uuid-dev
       shell: bash
 
-    # Checkout dlt-viewer's revision v2.24.0
+    # Install Java 11
+    - name: Install Java 11
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '11'
+
+    # Install cmake version v3.24.x
+    - name: Setup cmake
+      uses: jwlawson/[email protected]
+      with:
+        cmake-version: 'v3.24.x'
+
+    # Checkout dlt-viewer's revision v2.25.0
     - name: Checkout of the dlt-viewer
       uses: actions/checkout@v3
       with:
         repository: GENIVI/dlt-viewer
-        ref: ebb3c355bc0edf2b6c3be84452b8afa4d1a82641
+        ref: v2.25.0
 
     # Checkout project's revision, which is pushed
     - name: Checkout of the ${{ github.event.repository.name }}
@@ -40,7 +53,7 @@ jobs:
         repository: svlad-90/${{ github.event.repository.name }}
         path: ./plugin/${{ github.event.repository.name }}
         ref: ${{ github.ref }}
-        
+
     # Adjust dlt-viewer's CMake file to sub-include the plugin
     - name: Patch dlt-viewer's CMakeLists.txt
       run: echo 'add_subdirectory(${{ github.event.repository.name }}/dltmessageanalyzerplugin/src)' >> CMakeLists.txt
@@ -68,7 +81,7 @@ jobs:
       run: cmake ../${{ github.event.repository.name }}
       shell: bash
       working-directory: ../build
-    
+
     # Build of the project
     - name: Make
       run: make -j8

diff --git a/.github/workflows/build_linux_qt6.yml b/.github/workflows/build_linux_qt6.yml
@@ -8,13 +8,13 @@ on:
   workflow_dispatch:
     inputs:
       branch:
-        description: 'Target branch'     
+        description: 'Target branch'
         required: true
         default: 'master'
 
 jobs:
   build_linux:
-    
+
     runs-on: ubuntu-latest
 
     steps:
@@ -26,12 +26,25 @@ jobs:
            sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install uuid-dev
       shell: bash
 
-    # Checkout dlt-viewer's revision v2.24.0
+    # Install Java 11
+    - name: Install Java 11
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '11'
+
+    # Install cmake version v3.24.x
+    - name: Setup cmake
+      uses: jwlawson/[email protected]
+      with:
+        cmake-version: 'v3.24.x'
+
+    # Checkout dlt-viewer's revision v2.25.0
     - name: Checkout of the dlt-viewer
       uses: actions/checkout@v3
       with:
         repository: GENIVI/dlt-viewer
-        ref: ebb3c355bc0edf2b6c3be84452b8afa4d1a82641
+        ref: v2.25.0
 
     # Checkout project's revision, which is pushed
     - name: Checkout of the ${{ github.event.repository.name }}
@@ -40,7 +53,7 @@ jobs:
         repository: svlad-90/${{ github.event.repository.name }}
         path: ./plugin/${{ github.event.repository.name }}
         ref: ${{ github.ref }}
-        
+
     # Adjust dlt-viewer's CMake file to sub-include the plugin
     - name: Patch dlt-viewer's CMakeLists.txt
       run: echo 'add_subdirectory(${{ github.event.repository.name }}/dltmessageanalyzerplugin/src)' >> CMakeLists.txt
@@ -69,7 +82,7 @@ jobs:
       run: cmake ../${{ github.event.repository.name }}
       shell: bash
       working-directory: ../build
-    
+
     # Build of the project
     - name: Make
       run: make -j8

diff --git a/.github/workflows/build_windows_qt5.yml b/.github/workflows/build_windows_qt5.yml
@@ -8,50 +8,63 @@ on:
   workflow_dispatch:
     inputs:
       branch:
-        description: 'Target branch'     
+        description: 'Target branch'
         required: true
         default: 'master'
 
 jobs:
   build_windows:
-    
+
     runs-on: windows-latest
 
     steps:
 
     - uses: ilammy/msvc-dev-cmd@v1
-         
+
     # Creation of the ..\downloads directory
     - name: Creation of the "..\downloads" directory
       run: mkdir ..\downloads
       shell: cmd
       working-directory: .\
-    
+
     # Creation of the ..\tools directory
     - name: Creation of the "..\tools" directory
       run: mkdir ..\tools
       shell: cmd
       working-directory: .\
-         
+
     # Installation of jom
     - name: Installation of the jom
       run: |
            Invoke-WebRequest http://download.qt.io/official_releases/jom/jom.zip -OutFile ..\downloads\jom.zip
-           Expand-Archive '..\downloads\jom.zip' '..\tools\jom' 
+           Expand-Archive '..\downloads\jom.zip' '..\tools\jom'
       shell: powershell
-      
+
     # Add jom to path
     - name: Add jom to path
       run: |
            echo "D:/a/${{ github.event.repository.name }}/tools/jom/" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       shell: powershell
 
-    # Checkout dlt-viewer's revision v2.24.0
+    # Install Java 11
+    - name: Install Java 11
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '11'
+
+    # Install cmake version v3.24.x
+    - name: Setup cmake
+      uses: jwlawson/[email protected]
+      with:
+        cmake-version: 'v3.24.x'
+
+    # Checkout dlt-viewer's revision v2.25.0
     - name: Checkout of the dlt-viewer
       uses: actions/checkout@v3
       with:
         repository: GENIVI/dlt-viewer
-        ref: ebb3c355bc0edf2b6c3be84452b8afa4d1a82641
+        ref: v2.25.0
 
     # Checkout project's revision, which is pushed
     - name: Checkout of the project
@@ -60,7 +73,7 @@ jobs:
         repository: svlad-90/${{ github.event.repository.name }}
         path: .\plugin\${{ github.event.repository.name }}
         ref: ${{ github.ref }}
-        
+
     # Adjust dlt-viewer's plugin CMakeLists.txt file to sub-include the plugin
     - name: Patch dlt-viewer's plugin CMakeLists.txt
       run: Add-Content .\CMakeLists.txt "`nadd_subdirectory(${{ github.event.repository.name }}/dltmessageanalyzerplugin/src)"
@@ -89,14 +102,14 @@ jobs:
         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"
       shell: cmd
       working-directory: ..\build
-    
+
     #List files in build folder
     - name: List files in build folder
       run: |
         dir
       shell: cmd
       working-directory: ..\build
-    
+
     # Build of the project
     - name: Jom
       run: |