-
Notifications
You must be signed in to change notification settings - Fork 87
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1468 from xiaoyifang/staged
merge staged changes to dev
- Loading branch information
Showing
104 changed files
with
9,068 additions
and
3,725 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,83 +1,84 @@ | ||
| name: Ubuntu-PR-check | ||
| concurrency: | ||
| group: ${{ github.workflow }}-${{ github.ref }} | ||
| cancel-in-progress: true | ||
| on: | ||
|
|
||
| workflow_dispatch: | ||
|
|
||
| pull_request: | ||
| branches: | ||
| - dev | ||
| - master | ||
| - staged | ||
| paths-ignore: | ||
| - 'docs/**' | ||
| # - ".github/**" | ||
| - "howto/**" | ||
| - "*.md" | ||
| - "locale/**" | ||
| - "website/**" | ||
|
|
||
| jobs: | ||
| build: | ||
| name: Build | ||
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| matrix: | ||
| os: [ubuntu-latest] | ||
| qt_ver: [5.15.2,6.6.0] | ||
| qt_arch: [gcc_64] | ||
|
|
||
| steps: | ||
| - name: Install Qt | ||
| if: ${{ matrix.qt_ver == '5.15.2' }} | ||
| uses: jurplel/install-qt-action@v3 | ||
| with: | ||
| version: ${{ matrix.qt_ver }} | ||
|
|
||
| modules: qtwebengine | ||
|
|
||
| - name: Install Qt | ||
| if: ${{ matrix.qt_ver != '5.15.2' }} | ||
| uses: jurplel/install-qt-action@v3 | ||
| with: | ||
| version: ${{ matrix.qt_ver }} | ||
| arch: ${{ matrix.qt_arch }} | ||
|
|
||
| modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech | ||
|
|
||
| - name: ubuntu install thirdparty dependencies | ||
| run: | | ||
| sudo apt-get install git pkg-config build-essential qt5-qmake | ||
| sudo apt-get install libvorbis-dev zlib1g-dev libhunspell-dev x11proto-record-dev | ||
| sudo apt-get install qtdeclarative5-dev libxtst-dev liblzo2-dev libbz2-dev | ||
| sudo apt-get install libavutil-dev libavformat-dev libeb16-dev | ||
| sudo apt-get install libqt5webkit5-dev libqt5svg5-dev libqt5x11extras5-dev qttools5-dev | ||
| sudo apt-get install qttools5-dev-tools qtmultimedia5-dev libqt5multimedia5-plugins doxygen libzstd-dev #libopencc-dev | ||
| sudo apt-get install libxkbcommon-dev libc6-dev | ||
| sudo ln -sf /usr/bin/x86_64-linux-gnu-ld.gold /usr/bin/ld | ||
| git clone https://github.com/BYVoid/OpenCC | ||
| pwd | ||
| cd OpenCC/ | ||
| make PREFIX=/usr -j$(nproc) | ||
| sudo make install | ||
| cd .. | ||
| sudo apt install libxapian-dev | ||
| sudo apt-get install libzim-dev | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| fetch-depth: 1 | ||
| submodules: true | ||
|
|
||
| - name: build goldendict | ||
| run: | | ||
| qmake CONFIG+=release PREFIX=/usr CONFIG+=zim_support CONFIG+=chinese_conversion_support CONFIG+=use_iconv CONFIG+=use_xapian | ||
| make INSTALL_ROOT=appdir -j`nproc` install; find appdir/ | ||
| #copy missing shared dll to appdir. | ||
| mkdir -p appdir/usr/lib | ||
| cp $(ldd appdir/usr/bin/goldendict | grep -o '\W/[^ ]*' |grep gobject ) appdir/usr/lib | ||
| cp $(ldd appdir/usr/bin/goldendict | grep -o '\W/[^ ]*' |grep libpango ) appdir/usr/lib | ||
| name: Ubuntu-PR-check | ||
| concurrency: | ||
| group: ${{ github.workflow }}-${{ github.ref }} | ||
| cancel-in-progress: true | ||
| on: | ||
|
|
||
| workflow_dispatch: | ||
|
|
||
| pull_request: | ||
| branches: | ||
| - dev | ||
| - master | ||
| - experimental | ||
| - staged | ||
| paths-ignore: | ||
| - 'docs/**' | ||
| # - ".github/**" | ||
| - "howto/**" | ||
| - "*.md" | ||
| - "locale/**" | ||
| - "website/**" | ||
|
|
||
| jobs: | ||
| build: | ||
| name: Build | ||
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| matrix: | ||
| os: [ubuntu-latest] | ||
| qt_ver: [5.15.2,6.6.0] | ||
| qt_arch: [gcc_64] | ||
|
|
||
| steps: | ||
| - name: Install Qt | ||
| if: ${{ matrix.qt_ver == '5.15.2' }} | ||
| uses: jurplel/install-qt-action@v3 | ||
| with: | ||
| version: ${{ matrix.qt_ver }} | ||
|
|
||
| modules: qtwebengine | ||
|
|
||
| - name: Install Qt | ||
| if: ${{ matrix.qt_ver != '5.15.2' }} | ||
| uses: jurplel/install-qt-action@v3 | ||
| with: | ||
| version: ${{ matrix.qt_ver }} | ||
| arch: ${{ matrix.qt_arch }} | ||
|
|
||
| modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech | ||
|
|
||
| - name: ubuntu install thirdparty dependencies | ||
| run: | | ||
| sudo apt-get install git pkg-config build-essential qt5-qmake | ||
| sudo apt-get install libvorbis-dev zlib1g-dev libhunspell-dev x11proto-record-dev | ||
| sudo apt-get install qtdeclarative5-dev libxtst-dev liblzo2-dev libbz2-dev | ||
| sudo apt-get install libavutil-dev libavformat-dev libeb16-dev | ||
| sudo apt-get install libqt5webkit5-dev libqt5svg5-dev libqt5x11extras5-dev qttools5-dev | ||
| sudo apt-get install qttools5-dev-tools qtmultimedia5-dev libqt5multimedia5-plugins doxygen libzstd-dev #libopencc-dev | ||
| sudo apt-get install libxkbcommon-dev libc6-dev | ||
| sudo ln -sf /usr/bin/x86_64-linux-gnu-ld.gold /usr/bin/ld | ||
| git clone https://github.com/BYVoid/OpenCC | ||
| pwd | ||
| cd OpenCC/ | ||
| make PREFIX=/usr -j$(nproc) | ||
| sudo make install | ||
| cd .. | ||
| sudo apt install libxapian-dev | ||
| sudo apt-get install libzim-dev | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 1 | ||
| submodules: true | ||
|
|
||
| - name: build goldendict | ||
| run: | | ||
| qmake CONFIG+=release PREFIX=/usr CONFIG+=zim_support CONFIG+=chinese_conversion_support CONFIG+=use_iconv CONFIG+=use_xapian | ||
| make INSTALL_ROOT=appdir -j`nproc` install; find appdir/ | ||
| #copy missing shared dll to appdir. | ||
| mkdir -p appdir/usr/lib | ||
| cp $(ldd appdir/usr/bin/goldendict | grep -o '\W/[^ ]*' |grep gobject ) appdir/usr/lib | ||
| cp $(ldd appdir/usr/bin/goldendict | grep -o '\W/[^ ]*' |grep libpango ) appdir/usr/lib | ||
Oops, something went wrong.