Skip to content

Add clang format to action #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
name: CI

on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
clang-format:
name: Check clang-format
runs-on: ubuntu-latest
container: archlinux:latest
steps:
- name: Install dependencies
run: |
pacman -Syu --noconfirm git clang diffutils
git config --global --add safe.directory $GITHUB_WORKSPACE
- uses: actions/checkout@v4
- uses: fcitx/github-actions@clang-format
check:
name: Build and test
needs: clang-format
runs-on: ubuntu-latest
container: archlinux:latest
strategy:
Expand All @@ -37,20 +47,15 @@ jobs:
uses: actions/cache@v4
with:
path: 'fcitx5/**/*.tar.*'
key: ${{ runner.os }}-${{ hashFiles('fcitx5/src/modules/spell/CMakeLists.txt') }}
key: ${{ runner.os }}-${{ hashFiles('fcitx5/src/modules/spell/CMakeLists.txt')
}}
- name: Build and Install fcitx5
uses: fcitx/github-actions@cmake
with:
path: fcitx5
cmake-option: >-
-DENABLE_KEYBOARD=Off
-DENABLE_X11=Off
-DENABLE_WAYLAND=Off
-DENABLE_ENCHANT=Off
-DENABLE_DBUS=Off
-DENABLE_SERVER=Off
-DENABLE_EMOJI=Off
-DUSE_SYSTEMD=Off
-DENABLE_KEYBOARD=Off -DENABLE_X11=Off -DENABLE_WAYLAND=Off -DENABLE_ENCHANT=Off
-DENABLE_DBUS=Off -DENABLE_SERVER=Off -DENABLE_EMOJI=Off -DUSE_SYSTEMD=Off
- uses: actions/checkout@v4
with:
repository: fcitx/fcitx5-qt
Expand All @@ -61,9 +66,7 @@ jobs:
repository: fcitx/fcitx5-qt
path: fcitx5-qt
cmake-option: >-
-DENABLE_QT4=Off
-DENABLE_QT5=Off
-DENABLE_QT6=On
-DENABLE_QT4=Off -DENABLE_QT5=Off -DENABLE_QT6=On
- uses: actions/checkout@v4
with:
repository: naokiri/cskk
Expand All @@ -78,9 +81,7 @@ jobs:
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: Build and install cskk
shell: bash
run: |
cd cskk
cargo cinstall --release --prefix=/usr
run: "cd cskk\ncargo cinstall --release --prefix=/usr \n"
- uses: actions/checkout@v4
with:
path: fcitx5-cskk
Expand All @@ -94,8 +95,7 @@ jobs:
with:
path: fcitx5-cskk
cmake-option: >-
-DENABLE_QT=On
-DUSE_QT6=On
-DENABLE_QT=On -DUSE_QT6=On
- name: Test
run: |
ctest --test-dir fcitx5-cskk/build
Expand Down
4 changes: 2 additions & 2 deletions gui/adddictdialog.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* SPDX-FileCopyrightText: <text>2013~2022 CSSlayer <[email protected]>, Naoaki Iwakiri
* <[email protected]></text>
* SPDX-FileCopyrightText: <text>2013~2022 CSSlayer <[email protected]>, Naoaki
* Iwakiri <[email protected]></text>
*
* SPDX-License-Identifier: GPL-3.0-or-later
*
Expand Down
4 changes: 2 additions & 2 deletions gui/dictmodel.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* SPDX-FileCopyrightText: <text>2013~2022 CSSlayer <[email protected]>, Naoaki Iwakiri
* <[email protected]></text>
* SPDX-FileCopyrightText: <text>2013~2022 CSSlayer <[email protected]>, Naoaki
* Iwakiri <[email protected]></text>
*
* SPDX-License-Identifier: GPL-3.0-or-later
*
Expand Down
4 changes: 2 additions & 2 deletions gui/dictwidget.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* SPDX-FileCopyrightText: <text>2013~2022 CSSlayer <[email protected]>, Naoaki Iwakiri
* <[email protected]></text>
* SPDX-FileCopyrightText: <text>2013~2022 CSSlayer <[email protected]>, Naoaki
* Iwakiri <[email protected]></text>
*
* SPDX-License-Identifier: GPL-3.0-or-later
*
Expand Down
10 changes: 5 additions & 5 deletions gui/main.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
namespace fcitx {

class CskkConfigPlugin : public FcitxQtConfigUIPlugin {
Q_OBJECT
Q_OBJECT
public:
Q_PLUGIN_METADATA(IID FcitxQtConfigUIFactoryInterface_iid FILE
"cskk-config.json")
explicit CskkConfigPlugin(QObject *parent = 0);
FcitxQtConfigUIWidget *create(const QString &key) override;
Q_PLUGIN_METADATA(IID FcitxQtConfigUIFactoryInterface_iid FILE
"cskk-config.json")
explicit CskkConfigPlugin(QObject *parent = 0);
FcitxQtConfigUIWidget *create(const QString &key) override;
};

} // namespace fcitx
Expand Down
3 changes: 2 additions & 1 deletion test/basic_test.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/*
* Copyright (c) 2021 Naoaki Iwakiri
* This program is released under GNU General Public License version 3 or later
* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*
* Creation Date: 2021-05-08
*
Expand Down
6 changes: 3 additions & 3 deletions test/main.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/*
* Copyright (c) 2021 Naoaki Iwakiri
* This program is released under GNU General Public License version 3 or later
* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*
* Creation Date: 2021-05-08
*
Expand All @@ -13,8 +14,7 @@

#include "gtest/gtest.h"

int main(int argc, char** argv) {
int main(int argc, char **argv) {
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}