Skip to content

Commit 0e8cba3

Browse files
committed
fix: appimage build and deploy
1 parent cffe835 commit 0e8cba3

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

.github/workflows/deploy-linux-appimage.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,19 @@ on:
88
jobs:
99
deploy:
1010
runs-on: ubuntu-latest
11+
container:
12+
image: ghcr.io/${{ github.repository }}/ubuntu:feature-docker_build_appimage
13+
options: --cap-add SYS_ADMIN --device /dev/fuse --security-opt apparmor:unconfined
1114
steps:
1215
- name: Checkout code
1316
uses: actions/checkout@v2
1417
with:
1518
submodules: true
16-
- name: Install package
17-
run: |
18-
sudo apt-get update
19-
sudo apt-get -y install qtbase5-dev qt3d5-dev libqt5svg5-dev freeglut3-dev libabsl-dev
19+
fetch-depth: 0
2020
- name: Build and test
2121
run: ci/buildappimage.sh
22+
env:
23+
LD_LIBRARY_PATH: /opt/lib
2224
- name: Create Release
2325
uses: softprops/action-gh-release@v1
2426
with:

ci/buildappimage.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ trap cleanup EXIT
2525
REPO_ROOT=$(readlink -f $(dirname $(dirname $0)))
2626
OLD_CWD=$(readlink -f .)
2727

28+
git config --global --add safe.directory $REPO_ROOT
29+
2830
# generate release name
2931
COMMIT=$(git rev-parse --short HEAD)
3032
TAG=$(git describe --tags)

ci/docker/ubuntu/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
FROM ubuntu:noble
22

3-
RUN apt update && apt install -y libglib2.0-bin libxkbcommon0 libdbus-1-3 \
3+
RUN apt update && apt install -y libglib2.0-bin libdbus-1-3 libgtk-3-0 \
4+
libxcb* libxkbcommon* \
45
freeglut3-dev lcov \
56
build-essential cmake \
6-
fuse
7+
fuse file
78

89
RUN apt update && apt install -y wget unzip git python3-jinja2 python3-pip
910
RUN pip install aqtinstall --break-system-packages
1011

11-
RUN aqt install-qt -O /opt/qt linux desktop 6.8.2 -m qt3d
12+
RUN aqt install-qt -O /opt/qt linux desktop 6.8.2 -m qt3d qtshadertools
13+
ENV PATH="/opt/qt/6.8.2/gcc_64/bin/:$PATH"
1214

1315
RUN wget http://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip
1416
RUN unzip build-wrapper-linux-x86.zip -d /opt

0 commit comments

Comments
 (0)