Skip to content

Commit ee4d25c

Browse files
Merge pull request #1300 from contour-terminal/improvement/config_refactor
Refactor configuration loading
2 parents 5f9a1ed + b328cdb commit ee4d25c

File tree

18 files changed

+3766
-2304
lines changed

18 files changed

+3766
-2304
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,7 @@ jobs:
437437
run: |
438438
set -ex
439439
echo killing...; sudo pkill -9 XProtect >/dev/null || true; # see https://github.com/actions/runner-images/issues/7522
440+
echo waiting...; while pgrep XProtect; do sleep 3; done;
440441
cd build; cpack -G DragNDrop --verbose; cd -
441442
# cmake --build build --target package-verbose
442443
# ls -hl build/
@@ -472,7 +473,7 @@ jobs:
472473
- name: Install Qt
473474
uses: jurplel/install-qt-action@v3
474475
with:
475-
version: "6.6.*"
476+
version: "6.6.1"
476477
#version: "5.15.*"
477478
modules: qtmultimedia qt5compat qtshadertools
478479
- name: "vcpkg: Install dependencies"

metainfo.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
<release version="0.4.4" urgency="medium" type="development">
108108
<description>
109109
<ul>
110+
<li> Add generation of config file from internal state (#1282) </li>
110111
<li> Fixes corruption of sixel image on high resolution (#1049) </li>
111112
</ul>
112113
</description>

0 commit comments

Comments
 (0)