From 799d483c60e9bd9c111091eb01df47a9f0b6b7b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Kubern=C3=A1t?= <vkubernat@elektroline.cz>
Date: Wed, 25 Oct 2023 16:52:31 +0200
Subject: [PATCH 1/4] CI: windows: Copy correct mingw libraries

---
 .github/workflows/installer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml
index f8f7ce6..ed0ad13 100644
--- a/.github/workflows/installer.yml
+++ b/.github/workflows/installer.yml
@@ -39,7 +39,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

From f175aff24e6bebef7948c37308ad1c184f67ce8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Kubern=C3=A1t?= <vkubernat@elektroline.cz>
Date: Wed, 25 Oct 2023 16:56:20 +0200
Subject: [PATCH 2/4] CI: Skip workflows on push to the same branch/pr

---
 .github/workflows/appimage.yml  | 4 ++++
 .github/workflows/installer.yml | 4 ++++
 .github/workflows/lint.yml      | 4 ++++
 .github/workflows/test.yml      | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
index 0dad66d..6d446f1 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" ]
diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml
index ed0ad13..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" ]
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" ]

From 65604d1985199ddcd00fde396942fbada31694d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Kubern=C3=A1t?= <vkubernat@elektroline.cz>
Date: Wed, 25 Oct 2023 16:58:06 +0200
Subject: [PATCH 3/4] CI: appimage: Add qtnetworkauth

---
 .github/workflows/appimage.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
index 6d446f1..471983b 100644
--- a/.github/workflows/appimage.yml
+++ b/.github/workflows/appimage.yml
@@ -25,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

From 9ba1e3d05f674eba5c9390f4000afd6a78ce0830 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Kubern=C3=A1t?= <vkubernat@elektroline.cz>
Date: Wed, 25 Oct 2023 17:08:25 +0200
Subject: [PATCH 4/4] Bump version

---
 shvspy/src/appversion.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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"