Skip to content

Commit 2fd69a3

Browse files
committed
fix git actions build process for macOS and Windows
1 parent e66e261 commit 2fd69a3

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,25 @@ jobs:
2525
uses: jurplel/install-qt-action@v4
2626
with:
2727
version: ${{ matrix.qt-version }}
28+
modules: 'qtbase qttools qtnetwork'
2829
cache: true
29-
cache-key-prefix: install-qt-action
30+
cache-key-prefix: install-qt-action-${{ matrix.os }}-${{ matrix.qt-version }}
31+
setup-python: false
3032

3133
- name: Configure CMake
3234
run: |
3335
cd tests
3436
cmake -B build -DCMAKE_BUILD_TYPE=Release
35-
37+
3638
- name: Build tests
3739
run: |
3840
cd tests
3941
cmake --build build --config Release
40-
42+
4143
- name: Run tests
4244
run: |
4345
cd tests
44-
ctest --test-dir build --output-on-failure --timeout 300
46+
ctest --test-dir build --output-on-failure --timeout 300 -C Release
4547
4648
- name: Upload test results
4749
uses: actions/upload-artifact@v4
@@ -64,13 +66,15 @@ jobs:
6466
uses: jurplel/install-qt-action@v4
6567
with:
6668
version: '6.7.0'
69+
modules: 'qtbase qttools qtnetwork'
6770
cache: true
68-
cache-key-prefix: install-qt-action
71+
cache-key-prefix: install-qt-action-ubuntu-6.7.0
72+
setup-python: false
6973

7074
- name: Install coverage tools
7175
run: |
7276
sudo apt-get update
73-
sudo apt-get install -y gcov lcov
77+
sudo apt-get install -y gcc lcov
7478
7579
- name: Configure CMake with coverage
7680
run: |

diff_match_patch.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ QString Diff::strOperation(Operation op) {
5252
QString Diff::toString() const {
5353
QString prettyText = text;
5454
// Replace linebreaks with Pilcrow signs.
55-
prettyText.replace('\n', L'\u00b6');
55+
prettyText.replace('\n', QChar(0x00b6));
5656
return QString("Diff(") + strOperation(operation) + QString(",\"")
5757
+ prettyText + QString("\")");
5858
}

manual-testing/diff_match_patch.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ QString Diff::strOperation(Operation op) {
5252
QString Diff::toString() const {
5353
QString prettyText = text;
5454
// Replace linebreaks with Pilcrow signs.
55-
prettyText.replace('\n', L'\u00b6');
55+
prettyText.replace('\n', QChar(0x00b6));
5656
return QString("Diff(") + strOperation(operation) + QString(",\"")
5757
+ prettyText + QString("\")");
5858
}

0 commit comments

Comments
 (0)