diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 0dad66d..471983b 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -1,5 +1,9 @@ name: AppImage +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + on: push: branches: [ "master" ] @@ -21,7 +25,7 @@ jobs: with: qt_version: 6.5.0 use_qt6: ON - modules: qtserialport qtwebsockets + modules: qtserialport qtwebsockets qtnetworkauth additional_cmake_args: -DCMAKE_INSTALL_PREFIX='${{ github.workspace }}/install/usr' - name: Create AppImage diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml index f8f7ce6..e352e40 100644 --- a/.github/workflows/installer.yml +++ b/.github/workflows/installer.yml @@ -1,5 +1,9 @@ name: Installer +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + on: push: branches: [ "master" ] @@ -39,7 +43,7 @@ jobs: - name: Copy MinGW runtime libraries # windeployqt is unable to copy those, because it looks for them next to where g++.exe is. On the GitHub runner, # they are in a different directory. - run: cp /mingw64/bin/{libstdc++-6.dll,libgcc_s_seh-1.dll,libwinpthread-1.dll} '${{ github.workspace }}/install/bin' + run: cp /c/mingw64/bin/{libstdc++-6.dll,libgcc_s_seh-1.dll,libwinpthread-1.dll} '${{ github.workspace }}/install/bin' shell: bash - name: Get app version diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c17510e..02ba76b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,5 +1,9 @@ name: Lint +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + on: push: branches: [ "master" ] diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bfa93e6..d3fb088 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,9 @@ name: Test +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + on: push: branches: [ "master" ] diff --git a/shvspy/src/appversion.h b/shvspy/src/appversion.h index 593244a..794ad66 100644 --- a/shvspy/src/appversion.h +++ b/shvspy/src/appversion.h @@ -1,4 +1,4 @@ #pragma once -#define APP_VERSION "1.5.1" +#define APP_VERSION "1.5.2"