Skip to content

Commit c01fa50

Browse files
authored
fix: ci on win and unit (#105)
* Fix CI on Windows x86 * Every number that is not 1 is considered plural,so it's "zero points"
1 parent 607028e commit c01fa50

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

.github/workflows/appimage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
if: ${{ !contains( needs.check_commit_msg.outputs.commit_message, 'NO_MAIN') }}
3636
strategy:
3737
matrix:
38-
qt_version: [5.15.0]
38+
qt_version: [5.15.2]
3939
platform: [ubuntu-16.04]
4040
arch: [x64]
4141
fail-fast: false

.github/workflows/cpack-deb-ubuntu.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ jobs:
3434
strategy:
3535
fail-fast: false
3636
matrix:
37-
#distro: [14.04, 16.04, 18.04, 20.04]
3837
distro: [20.04]
3938
#arch: [x86, x64]
4039
needs: check_commit_msg

.github/workflows/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
matrix:
2121
os: [macos-latest]
22-
qt_ver: [5.15.0]
22+
qt_ver: [5.15.2]
2323
qt_arch: [clang_64]
2424
env:
2525
targetName: lemon

.github/workflows/windows.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
name: Build
2222
strategy:
2323
matrix:
24-
qt_version: [5.15.0]
24+
qt_version: [5.15.2]
2525
platform: [windows-latest]
2626
arch: [x86, x64]
2727
include:
@@ -46,10 +46,10 @@ jobs:
4646
uses: actions/checkout@v2
4747
with:
4848
submodules: 'recursive'
49-
- name: Install Python 3.7 version
49+
- name: Install Python 3.9 version
5050
uses: actions/setup-python@v1
5151
with:
52-
python-version: '3.7'
52+
python-version: '3.9'
5353
architecture: ${{ matrix.arch }}
5454
- name: Restoring submodules
5555
run: git submodule update --init
@@ -73,6 +73,7 @@ jobs:
7373
arch: ${{ matrix.qtarch }}
7474
mirror: 'http://mirrors.ocf.berkeley.edu/qt/'
7575
cached: ${{ steps.cache-qt.outputs.cache-hit }}
76+
setup-python: 'false'
7677

7778
- name: Win-${{ matrix.arch }} - ${{ matrix.qt_version }} - Generate Dependencies and Build
7879
shell: bash

makespec/BUILDVERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
105
1+
106

src/judgingdialog.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ void JudgingDialog::singleCaseFinished(int progress, int x, int y, int result, i
146146
addtext += tr(" %1 MB").arg(1.00 * memoryUsed / 1024.00 / 1024.00);
147147

148148
if (scoreGot > 0)
149-
scoretext = tr(" %1 Pt").arg(scoreGot);
149+
scoretext = tr(" %1 %2").arg(scoreGot).arg(scoreGot == 1 ? tr("Pt") : tr("Pts"));
150150

151151
charFormat.setForeground(QBrush(Qt::darkGreen));
152152
scorecharFormat.setForeground(QBrush(Qt::darkCyan));
@@ -163,11 +163,11 @@ void JudgingDialog::singleCaseFinished(int progress, int x, int y, int result, i
163163
addtext += tr(" %1 MB").arg(1.00 * memoryUsed / 1024.00 / 1024.00);
164164

165165
if (scoreGot > 0) {
166-
scoretext = tr(" %1 Pt").arg(scoreGot);
166+
scoretext = tr(" %1 %2").arg(scoreGot).arg(scoreGot == 1 ? tr("Pt") : tr("Pts"));
167167
scorecharFormat.setForeground(QBrush(Qt::darkCyan));
168168
scorecharFormat.setFontWeight(QFont::Bold);
169169
} else {
170-
scoretext = tr(" %1 Pt").arg(qAbs(scoreGot));
170+
scoretext = tr(" %1 %2").arg(qAbs(scoreGot)).arg(qAbs(scoreGot) == 1 ? tr("Pt") : tr("Pts"));
171171
scorecharFormat.setForeground(QBrush(Qt::darkYellow));
172172
}
173173

0 commit comments

Comments
 (0)