Skip to content

Commit 8d8ef2d

Browse files
authored
Merge pull request #535 from akiyosi/update-linux-devenv
Update linux build env
2 parents ff3b915 + 739950c commit 8d8ef2d

File tree

2 files changed

+21
-8
lines changed

2 files changed

+21
-8
lines changed

.github/workflows/ci.yaml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: CI
33
on: [push, pull_request]
44

55
env:
6-
cache-version: v12
6+
cache-version: v13
77

88
jobs:
99

@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
matrix:
1717
go-version: [1.21.x]
18-
platform: [ubuntu-20.04]
18+
platform: [ubuntu-22.04]
1919
qtversion: [5.15.6]
2020
runs-on: ${{ matrix.platform }}
2121
env:
@@ -32,7 +32,7 @@ jobs:
3232
run: |
3333
sudo apt update
3434
sudo apt-get -y install build-essential libglu1-mesa-dev libpulse-dev libglib2.0-dev cmake
35-
sudo apt-get --no-install-recommends -qq -y install fontconfig libasound2 libegl1-mesa libnss3 libpci3 libxcomposite1 libxcursor1 libxi6 libxrandr2 libxtst6
35+
sudo apt-get --no-install-recommends -qq -y install fontconfig libasound2 libegl1-mesa libegl1-mesa-dev libnss3 libpci3 libxcomposite1 libxcursor1 libxi6 libxrandr2 libxtst6
3636
sudo apt-get --no-install-recommends -qq -y install libdbus-1-dev libssl-dev libzstd-dev
3737
sudo apt-get install '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev
3838
sudo apt-get install libwayland-dev libwayland-egl++ wayland-scanner++
@@ -59,6 +59,19 @@ jobs:
5959
cd ${{ github.workspace }}/qt5 && ./configure -prefix ${{ github.workspace }}/Qt/${{ matrix.qtversion }}/gcc_64 -no-icu -confirm-license -opensource -static -qt-zlib -qt-libpng -qt-libjpeg -xcb -xcb-xlib -bundled-xcb-xinput -sysconfdir /etc/xdg -dbus-runtime -openssl-runtime -opengl -optimize-size -skip qtwebengine -skip qtfeedback -skip qtpim -feature-wayland-client -nomake tests -nomake examples && make -j $(grep -c ^processor /proc/cpuinfo) && make install -j $(grep -c ^processor /proc/cpuinfo)
6060
rm -fr ${{ github.workspace }}/qt5
6161
62+
- name: Check fcitx5 build env
63+
env:
64+
FILE: ${{ github.workspace }}/fcitx-qt5/qt5/platforminputcontext/CMakeLists.txt
65+
CMAKE_PREFIX_PATH: ${{ github.workspace }}/Qt/${{ matrix.qtversion }}/gcc_64/lib/cmake
66+
Qt5_DIR: ${{ github.workspace }}/Qt/${{ matrix.qtversion }}/gcc_64/lib/cmake/Qt5
67+
run: |
68+
echo $CMAKE_PREFIX_PATH
69+
echo $Qt5_DIR
70+
ls -l $CMAKE_PREFIX_PATH
71+
ls -l $Qt5_DIR
72+
ls -l ${{ github.workspace }}/Qt/${{ matrix.qtversion }}/gcc_64/lib/
73+
ls -l ${{ github.workspace }}/Qt/${{ matrix.qtversion }}/gcc_64/
74+
6275
- name: Build fcitx5
6376
env:
6477
FILE: ${{ github.workspace }}/fcitx-qt5/qt5/platforminputcontext/CMakeLists.txt

.github/workflows/release.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ on:
1313
- v[0-9]+.[0-9]+.[0-9]+
1414

1515
env:
16-
cache-version: v9
16+
cache-version: v11
1717

1818
jobs:
1919

2020
check-new-commit:
21-
runs-on: ubuntu-20.04
21+
runs-on: ubuntu-22.04
2222
steps:
2323
- name: Checkout code
2424
uses: actions/checkout@v2
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
matrix:
4040
go-version: [1.21.x]
41-
platform: [ubuntu-20.04]
41+
platform: [ubuntu-22.04]
4242
qtversion: [5.15.6]
4343
runs-on: ${{ matrix.platform }}
4444
env:
@@ -56,7 +56,7 @@ jobs:
5656
run: |
5757
sudo apt update
5858
sudo apt-get -y install build-essential libglu1-mesa-dev libpulse-dev libglib2.0-dev cmake
59-
sudo apt-get --no-install-recommends -qq -y install fontconfig libasound2 libegl1-mesa libnss3 libpci3 libxcomposite1 libxcursor1 libxi6 libxrandr2 libxtst6
59+
sudo apt-get --no-install-recommends -qq -y install fontconfig libasound2 libegl1-mesa libnss3 libpci3 libxcomposite1 libxcursor1 libxi6 libxrandr2 libxtst6
6060
sudo apt-get --no-install-recommends -qq -y install libdbus-1-dev libssl-dev libzstd-dev
6161
sudo apt-get install '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev
6262
sudo apt-get install libwayland-dev libwayland-egl++ wayland-scanner++
@@ -505,7 +505,7 @@ jobs:
505505
publish:
506506
# needs: [linux, windows, macos, freebsd]
507507
needs: [linux, windows, macos-x86_64, macos-arm64]
508-
runs-on: ubuntu-20.04
508+
runs-on: ubuntu-22.04
509509
permissions:
510510
contents: write
511511

0 commit comments

Comments
 (0)