Skip to content

Commit

Permalink
[ISSUE #194] Check that all builds are successful with dlt-viewer v2.…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
Vladyslav Goncharuk committed Feb 25, 2024
1 parent abe21be commit f284c1c
Show file tree
Hide file tree
Showing 17 changed files with 145 additions and 85 deletions.
19 changes: 13 additions & 6 deletions .github/workflows/build_clang_tidy_qt5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -31,12 +31,19 @@ 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: 'oracle'
java-version: '11'

# 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
Expand All @@ -45,7 +52,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
Expand Down Expand Up @@ -73,7 +80,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
Expand Down
19 changes: 13 additions & 6 deletions .github/workflows/build_clang_tidy_qt6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -31,12 +31,19 @@ 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: 'oracle'
java-version: '11'

# 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
Expand All @@ -45,7 +52,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
Expand Down Expand Up @@ -74,7 +81,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
Expand Down
19 changes: 13 additions & 6 deletions .github/workflows/build_linux_qt5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -26,12 +26,19 @@ 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: 'oracle'
java-version: '11'

# 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 }}
Expand All @@ -40,7 +47,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
Expand Down Expand Up @@ -68,7 +75,7 @@ jobs:
run: cmake ../${{ github.event.repository.name }}
shell: bash
working-directory: ../build

# Build of the project
- name: Make
run: make -j8
Expand Down
19 changes: 13 additions & 6 deletions .github/workflows/build_linux_qt6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -26,12 +26,19 @@ 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: 'oracle'
java-version: '11'

# 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 }}
Expand All @@ -40,7 +47,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
Expand Down Expand Up @@ -69,7 +76,7 @@ jobs:
run: cmake ../${{ github.event.repository.name }}
shell: bash
working-directory: ../build

# Build of the project
- name: Make
run: make -j8
Expand Down
31 changes: 19 additions & 12 deletions .github/workflows/build_windows_qt5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,50 +8,57 @@ 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: 'oracle'
java-version: '11'

# 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
Expand All @@ -60,7 +67,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)"
Expand Down Expand Up @@ -89,14 +96,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: |
Expand Down
Loading

0 comments on commit f284c1c

Please sign in to comment.