Skip to content

Commit

Permalink
Merge pull request #36 from silicon-heaven/fix-winbuild
Browse files Browse the repository at this point in the history
CI fixes and improvements
  • Loading branch information
fvacek authored Oct 25, 2023
2 parents b86af10 + 9ba1e3d commit 69c4ac7
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 3 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/appimage.yml
Original file line number Diff line number Diff line change
@@ -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" ]
Expand All @@ -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
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/installer.yml
Original file line number Diff line number Diff line change
@@ -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" ]
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -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" ]
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -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" ]
Expand Down
2 changes: 1 addition & 1 deletion shvspy/src/appversion.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma once

#define APP_VERSION "1.5.1"
#define APP_VERSION "1.5.2"

0 comments on commit 69c4ac7

Please sign in to comment.