Skip to content

Commit a7d6db2

Browse files
authored
Merge branch 'Project-LemonLime:master' into rewrite-export
2 parents 7145af4 + 0556778 commit a7d6db2

9 files changed

Lines changed: 21 additions & 42 deletions

File tree

.github/workflows/check_format.yml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,8 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v6
11-
- name: "Install clang-format"
12-
run: |
13-
sudo apt-get update
14-
sudo apt-get install clang-format
15-
- name: "Format Codes"
16-
run: clang-format -i src/*.cpp src/*.h src/**/*.cpp src/**/*.h src/**/**/*.cpp src/**/**/*.h src/**/*.hpp
17-
- name: Check diff
18-
run: git diff --exit-code HEAD
19-
- name: Create Pull Request
20-
if: failure()
21-
uses: peter-evans/create-pull-request@v8
11+
- uses: pachadotdev/clang-format@v1.1
2212
with:
13+
version: "21"
14+
auto-commit: true
2315
commit-message: "style: format codes"
24-
title: "Format codes for ${{ github.ref }}"
25-
labels: "style"
26-
assignees: "${{ github.actor }}"
27-
reviewers: "${{ github.actor }}"
28-
branch: "auto-pr/clang-format/${{ github.ref }}"

.github/workflows/deploy-manual.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
fetch-depth: 0
2323

24-
- uses: actions/setup-node@v4
24+
- uses: actions/setup-node@v6
2525
with:
2626
node-version: 24
2727
cache: 'npm'

.github/workflows/linux-static-qt6.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ jobs:
4545
apt update
4646
apt install -y software-properties-common
4747
add-apt-repository ppa:savoury1/build-tools
48+
add-apt-repository ppa:savoury1/fonts
49+
add-apt-repository ppa:savoury1/backports
50+
add-apt-repository ppa:savoury1/python
4851
apt update
4952
apt upgrade -y
5053
apt install -y build-essential git perl cmake ninja-build wget

.github/workflows/macos-qt6.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,11 @@ jobs:
3030
uses: jurplel/install-qt-action@v4
3131
with:
3232
version: ${{ matrix.qt_ver }}
33-
cached: ${{ steps.MacosCacheQt.outputs.cache-hit }}
33+
cache: true
3434

3535
- uses: actions/checkout@v6
3636
with:
3737
submodules: true
38-
- name: macOS - ${{ matrix.qt_version }} - Build preparation - Install Packages
39-
run: |
40-
brew install ninja pkg-config
4138
- name: build macos
4239
run: |
4340
cmake . \

.github/workflows/windows-qt6.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,31 +44,23 @@ jobs:
4444
with:
4545
submodules: "recursive"
4646
- name: Install Python 3.12 version
47-
uses: actions/setup-python@v4
47+
uses: actions/setup-python@v6
4848
with:
4949
python-version: "3.12"
5050
architecture: x64
5151
- name: Restoring submodules
5252
run: git submodule update --init
5353
# =========================================================================================================
5454
- name: Install MSVC compiler
55-
uses: ilammy/msvc-dev-cmd@v1
55+
uses: TheMrMilchmann/setup-msvc-dev@v4.0.0
5656
with:
57-
# 14.1 is for vs2017, 14.2 is vs2019, following the upstream vcpkg build from Qv2ray-deps repo
5857
arch: x64
59-
- name: Cache Qt
60-
id: cache-qt
61-
uses: actions/cache@v5
62-
with:
63-
path: ../Qt
64-
key: QtCache-${{ matrix.platform }}-x64-${{ matrix.qt_version }}
6558
- name: Installing Qt - x64
6659
uses: jurplel/install-qt-action@v4
6760
with:
6861
version: ${{ matrix.qt_version }}
6962
arch: ${{ matrix.qtarch }}
70-
mirror: "http://mirrors.ocf.berkeley.edu/qt/"
71-
cached: ${{ steps.cache-qt.outputs.cache-hit }}
63+
cache: true
7264
setup-python: "false"
7365
modules: "qtactiveqt"
7466

src/base/LemonBaseApplication.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ namespace Lemon {
1818
public:
1919
LemonBaseApplication(int &argc, char *argv[])
2020
: SingleApplication(argc, argv, true, User | ExcludeAppPath | ExcludeAppVersion),
21-
LemonApplicationInterface(){};
22-
virtual ~LemonBaseApplication(){};
21+
LemonApplicationInterface() {};
22+
virtual ~LemonBaseApplication() {};
2323

2424
virtual bool Initialize() final;
2525

src/core/processrunner.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
ProcessRunner::ProcessRunner(ProcessRunnerConfig cfg, const std::atomic<bool> &stop)
1717
: config(std::move(cfg)), stopFlag(stop) {}
1818

19-
auto ProcessRunner::create(ProcessRunnerConfig config,
20-
const std::atomic<bool> &stopFlag) -> std::unique_ptr<ProcessRunner> {
19+
auto ProcessRunner::create(ProcessRunnerConfig config, const std::atomic<bool> &stopFlag)
20+
-> std::unique_ptr<ProcessRunner> {
2121
#ifdef Q_OS_WIN32
2222
return std::make_unique<WinProcessRunner>(std::move(config), stopFlag);
2323
#else

src/lemon.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -879,8 +879,8 @@ void LemonLime::addTaskWithScoreScale(const QString &title,
879879
}
880880
}
881881

882-
auto LemonLime::compareFileName(const std::pair<QString, QString> &a,
883-
const std::pair<QString, QString> &b) -> bool {
882+
auto LemonLime::compareFileName(const std::pair<QString, QString> &a, const std::pair<QString, QString> &b)
883+
-> bool {
884884
return (a.first.length() < b.first.length()) ||
885885
(a.first.length() == b.first.length() && QString::localeAwareCompare(a.first, b.first) < 0);
886886
}

src/statisticsbrowser.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ StatisticsBrowser::~StatisticsBrowser() { delete ui; }
3333

3434
void StatisticsBrowser::setContest(Contest *contest) { curContest = contest; }
3535

36-
auto StatisticsBrowser::getScoreNormalChart(const QMap<int, int> &scoreCount, int listSize,
37-
int totalScore) -> QString {
36+
auto StatisticsBrowser::getScoreNormalChart(const QMap<int, int> &scoreCount, int listSize, int totalScore)
37+
-> QString {
3838
QString buffer = "";
3939
long long overallScoreSum = 0;
4040
double scoreDiscrim = 0;
@@ -230,8 +230,8 @@ auto StatisticsBrowser::getTestcaseScoreChart(QList<TestCase *> testCaseList,
230230
return buffer;
231231
}
232232

233-
auto StatisticsBrowser::checkValid(QList<Task *> taskList,
234-
const QList<Contestant *> &contestantList) -> bool {
233+
auto StatisticsBrowser::checkValid(QList<Task *> taskList, const QList<Contestant *> &contestantList)
234+
-> bool {
235235
for (auto *i : taskList) {
236236
for (auto *j : i->getTestCaseList()) {
237237
if (j->getInputFiles().length() != j->getOutputFiles().length())

0 commit comments

Comments
 (0)