Skip to content

Commit a2f3421

Browse files
authored
Fix (#49)
1 parent 4066f79 commit a2f3421

File tree

2 files changed

+24
-100
lines changed

2 files changed

+24
-100
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.

.github/workflows/build_pass.yml

Lines changed: 24 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,32 @@
11
name: Build passes check
2-
on: [ workflow_dispatch ]
2+
on: [ push ]
33
jobs:
44
build-check:
55
name: Build check
6-
runs-on: ubuntu-latest
7-
strategy:
8-
matrix:
9-
path:
10-
- 'src'
6+
runs-on: ubuntu-22.04
117
steps:
12-
- name: Install cargo
13-
uses: actions-rs/toolchain@v1
14-
with:
15-
toolchain: stable
16-
profile: minimal
17-
override: true
18-
- uses: actions/cache@v3
19-
with:
20-
path: |
21-
~/.cargo/bin/
22-
~/.cargo/registry/index/
23-
~/.cargo/registry/cache/
24-
~/.cargo/git/db/
25-
target
26-
key: ${{ runner.os }}-cargo-libtest-v6-${{ hashFiles('**/Cargo.lock') }}-cargo-c-v0.9.6
27-
- name: Install cbindgen
28-
uses: actions-rs/cargo@v1
29-
with:
30-
command: install
31-
args: cbindgen
32-
- name: cargo-c-exists
33-
id: cargoCCheck
34-
run: test -e ~/.cargo/bin/cargo-cbuild
35-
continue-on-error: true
36-
- name: Install cargo-c
37-
if: ${{ always() && steps.cargoCCheck.outcome == 'failure' }}
38-
uses: actions-rs/cargo@v1
39-
with:
40-
command: install
41-
args: cargo-c --version 0.9.6
42-
- name: Install required libs
43-
run: sudo apt-get install libxkbcommon-dev
44-
45-
- name: checkout cskk
8+
- name: checkout
469
uses: actions/checkout@v3
4710
with:
48-
repository: 'naokiri/cskk'
49-
path: cskk
50-
- name: Build CSKK library
51-
run: cargo cinstall
52-
working-directory: cskk
53-
- uses: actions/checkout@v3
11+
submodules: recursive
12+
- name: check fcitx5-cskk version
13+
id: version
14+
run: |
15+
echo ::set-output name=version::`bin/version.sh`
16+
- name: check cskk version
17+
id: cskk_version
18+
run: |
19+
echo ::set-output name=cskk_version::`bin/cskk_version.sh`
20+
- name: check fcitx5-cskk version exists in metainfo
21+
run: |
22+
bin/metainfo_version.sh
23+
- name: Download & install libcskk
24+
run: |
25+
wget https://github.com/naokiri/cskk/releases/download/v${{ steps.cskk_version.outputs.cskk_version }}/libcskk_${{ steps.cskk_version.outputs.cskk_version }}_amd64.deb
26+
sudo apt-get install ./libcskk_${{ steps.cskk_version.outputs.cskk_version }}_amd64.deb
27+
- name: Install required libs and dependencies
28+
run: |
29+
sudo apt-get install extra-cmake-modules libfcitx5core-dev qtbase5-dev libfcitx5-qt-dev gettext
5430
- name: Build
5531
uses: ashutoshvarma/action-cmake-build@master
5632
with:
@@ -59,4 +35,5 @@ jobs:
5935
cxx: g++
6036
build-type: Release
6137
run-test: false
62-
38+
configure-options: -DFCITX_INSTALL_USE_FCITX_SYS_PATHS=ON
39+
build-options: --verbose

0 commit comments

Comments
 (0)