Skip to content

Commit ab210c0

Browse files
authored
Fix dependency (#63)
Fix dependency issue
1 parent e0def21 commit ab210c0

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

.github/workflows/snap-creation.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ jobs:
5454
sudo apt install xvfb
5555
export DISPLAY=:99
5656
Xvfb :99 -screen 0 1024x768x16 &
57-
- name: Start tmate session (Debugging)
58-
if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
59-
uses: mxschmitt/action-tmate@v3
6057
- name: Create Snap Package
6158
run: |
6259
sudo lsb_release -a
6360
sudo snapcraft --destructive-mode
6461
cp *.snap webots/distribution
62+
- name: Start tmate session (Debugging)
63+
if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
64+
uses: mxschmitt/action-tmate@v3
6565
- uses: actions/upload-artifact@v4
6666
if: ${{ contains(github.event.pull_request.labels.*.name, 'test creation') || github.event_name == 'workflow_dispatch'}}
6767
with:

snapcraft.yaml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ parts:
7878
- ibus-gtk3
7979
- libibus-1.0-5
8080
- fcitx-frontend-gtk3
81+
- adwaita-icon-theme-full
82+
- libgdk-pixbuf2.0-bin
8183

8284
webots:
8385
build-packages:
@@ -102,16 +104,24 @@ parts:
102104
override-pull: |
103105
craftctl default
104106
./scripts/install/linux_optional_compilation_dependencies.sh
107+
pip3 install --no-input aqtinstall
108+
export PATH="$PATH:$HOME/.local/bin"
105109
sudo apt install --yes xvfb
106110
override-prime: |
107111
craftctl default
108112
rm -vf usr/lib/jvm/java-11-openjdk-*amd64/lib/security/blacklisted.certs
113+
if [ -d "$SNAPCRAFT_PRIME/usr/share/mime/packages" ]; then
114+
update-mime-database $SNAPCRAFT_PRIME/usr/share/mime
115+
fi
116+
mkdir -p $SNAPCRAFT_PRIME/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0
109117
stage-packages:
110118
- openjdk-18-jdk
111119
- ca-certificates-java
112120
- build-essential
113121
- libc6-dev
114122
- ffmpeg
123+
- libavcodec-extra
124+
- libblas3
115125
- freeglut3-dev
116126
- libaribb24-0
117127
- libasn1-8-heimdal
@@ -226,13 +236,18 @@ parts:
226236
- lsb-release
227237
- util-linux
228238
- zlib1g
239+
- libgdk-pixbuf2.0-0
240+
- librsvg2-common
241+
- shared-mime-info
229242

230243
apps:
231244
webots:
232245
environment:
233246
LANG: C.UTF-8
234247
LC_ALL: C.UTF-8
235248
DISABLE_WAYLAND: 1
249+
PATH: $SNAP/usr/bin:$PATH
250+
LD_LIBRARY_PATH: $SNAP/usr/lib/x86_64-linux-gnu:$SNAP/usr/lib/x86_64-linux-gnu/blas:$SNAP/usr/lib/x86_64-linux-gnu/lapack:$LD_LIBRARY_PATH
236251
plugs:
237252
- audio-playback
238253
- browser-support
@@ -243,7 +258,9 @@ apps:
243258
- joystick
244259
- network
245260
- unity7
261+
- opengl
262+
- removable-media
246263
desktop: usr/share/webots/resources/webots.desktop
247264
command-chain:
248265
- bin/desktop-launch
249-
command: usr/share/webots/webots
266+
command: usr/share/webots/webots

0 commit comments

Comments
 (0)