Skip to content

Commit

Permalink
Merge pull request #430 from silicon-heaven/ci-lupdate
Browse files Browse the repository at this point in the history
CI: Add lupdate check and update various stuff
  • Loading branch information
fvacek authored Mar 7, 2024
2 parents 4a5331c + 1d94130 commit 136f7c4
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/actions/cmake/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ runs:
# Linux deps
- name: Install/cache clazy, ninja, openldap, doctest, and Qt's dependencies
if: runner.os != 'Windows'
uses: awalsh128/cache-apt-pkgs-action@v1.3.0
uses: awalsh128/cache-apt-pkgs-action@v1.4.1
with:
packages: ninja-build doctest-dev libgl1-mesa-dev libpulse-dev libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-shape0 libxcb-util1 libxcb-xinerama0 libxkbcommon-x11-0 libldap-dev clazy
version: 1.0
Expand Down Expand Up @@ -52,7 +52,7 @@ runs:
modules: ${{ inputs.modules }}

- name: ccache
uses: hendrikmuhs/ccache-action@v1.2
uses: hendrikmuhs/ccache-action@v1.2.12
with:
key: ${{ github.job }}

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/run-linter/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ runs:
steps:
- uses: ./.github/actions/cmake
with:
qt_version: 6.5.0
qt_version: 6.5.3
use_qt6: ON
modules: qtserialport qtwebsockets
additional_cmake_args: -DCMAKE_GLOBAL_AUTOGEN_TARGET=ON -DCMAKE_AUTOGEN_ORIGIN_DEPENDS=OFF
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
CC: clang-15
CXX: clang++-15
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -35,7 +35,7 @@ jobs:
CC: clang-15
CXX: clang++-15
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down
36 changes: 36 additions & 0 deletions .github/workflows/lupdate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# vim: sw=2
name: lupdate

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

jobs:
ubuntu-qt6:
name: Qt 6.5.3 / Ubuntu 22.04
runs-on: ubuntu-22.04
env:
LIBSHV_RUN_LUPDATE: 1
steps:
- uses: actions/checkout@v4
with:
submodules: true

- name: Setup CMake
uses: ./.github/actions/cmake
with:
qt_version: 6.5.3
use_qt6: ON
modules: qtserialport qtwebsockets

- name: Refresh translation files
run: cmake --build '${{github.workspace}}/build' --target update_translations

- name: Check changes
run: git diff --exit-code
16 changes: 8 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
CFLAGS: -fsanitize=address,undefined
CXXFLAGS: -fsanitize=address,undefined
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -34,38 +34,38 @@ jobs:
uses: ./.github/actions/build-and-test

ubuntu-qt6:
name: Qt 6.5.0 / Ubuntu 22.04
name: Qt 6.5.3 / Ubuntu 22.04
runs-on: ubuntu-22.04
env:
CFLAGS: -fsanitize=address,undefined
CXXFLAGS: -fsanitize=address,undefined
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

- name: Setup CMake
uses: ./.github/actions/cmake
with:
qt_version: 6.5.0
qt_version: 6.5.3
use_qt6: ON
modules: qtserialport qtwebsockets

- name: Build and test
uses: ./.github/actions/build-and-test

windows:
name: Qt 6.5.0 / Windows
name: Qt 6.5.3 / Windows
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

- name: Setup CMake
uses: ./.github/actions/cmake
with:
qt_version: 6.5.0
qt_version: 6.5.3
qt_arch: win64_mingw
use_qt6: ON
modules: qtserialport qtwebsockets
Expand All @@ -81,7 +81,7 @@ jobs:
name: Qt 6.6.2 / NixOS
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: Install Nix
Expand Down

0 comments on commit 136f7c4

Please sign in to comment.