Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dependency #63

Merged
merged 47 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
f91486a
Fix dependency
MNikoliCC Dec 18, 2024
a603697
Fix
MNikoliCC Dec 18, 2024
bb6325d
Revert
MNikoliCC Dec 18, 2024
80ac83d
Fix
MNikoliCC Dec 18, 2024
69addcd
Add gnome
MNikoliCC Dec 18, 2024
745f8f9
Fix aqt dependency
MNikoliCC Dec 18, 2024
08ce671
Fix
MNikoliCC Dec 18, 2024
0ac43de
Switch branch
MNikoliCC Dec 18, 2024
75d7320
Test2
MNikoliCC Dec 18, 2024
ee1e8f1
Test3
MNikoliCC Dec 19, 2024
f383287
Test4
MNikoliCC Dec 19, 2024
f39ba4c
Remove gtk3, add instructions
MNikoliCC Dec 19, 2024
2c2951e
Last version
MNikoliCC Dec 19, 2024
e3eab79
Remove gtk2
MNikoliCC Dec 20, 2024
fbecaa9
Modify desktop-gtk3
MNikoliCC Dec 20, 2024
3d05723
Modify gtk3
MNikoliCC Dec 30, 2024
9f6eb30
Move tmate after snap creation
MNikoliCC Dec 30, 2024
6d238b0
Remove desktop-gtk3, Update gnome extension
MNikoliCC Jan 3, 2025
ade8be8
Mesa remove
MNikoliCC Jan 3, 2025
32de955
Add command-chain
MNikoliCC Jan 3, 2025
e9ffd8c
Fix
MNikoliCC Jan 3, 2025
4737f73
Fix layout
MNikoliCC Jan 3, 2025
57173e0
Fix
MNikoliCC Jan 3, 2025
8794aa2
Fix
MNikoliCC Jan 3, 2025
d4d719d
Fix
MNikoliCC Jan 3, 2025
aedfe78
Remove libraries
MNikoliCC Jan 3, 2025
bc11e0a
Remove overlaping libs
MNikoliCC Jan 3, 2025
48bd376
Remove gtk2
MNikoliCC Jan 3, 2025
a93908d
Remove glib
MNikoliCC Jan 6, 2025
5e988d1
Revert, Fix pixbuf
MNikoliCC Jan 6, 2025
3d2511d
Fix
MNikoliCC Jan 6, 2025
bc126a1
Fix
MNikoliCC Jan 6, 2025
82b5829
Revert
MNikoliCC Jan 6, 2025
dfb27b1
Fix
MNikoliCC Jan 6, 2025
5bff79e
Fix
MNikoliCC Jan 6, 2025
3c1cad6
Fix
MNikoliCC Jan 6, 2025
6b85f28
Remove dbus, accessibility
MNikoliCC Jan 6, 2025
ef69a23
Fix
MNikoliCC Jan 6, 2025
dda3df4
Add path
MNikoliCC Jan 6, 2025
b1163d2
Fix ffmpeg warning
MNikoliCC Jan 10, 2025
bfdf46d
Target develop branch, execute linux_runtime_dependencies.sh
MNikoliCC Jan 10, 2025
cbec5f1
Fix
MNikoliCC Jan 10, 2025
cf97fa1
FIx libblas3 error
MNikoliCC Jan 10, 2025
8b694dd
Fix
MNikoliCC Jan 10, 2025
767a25e
Fix lapack error
MNikoliCC Jan 10, 2025
b938783
Clear, revert branches
MNikoliCC Jan 13, 2025
cc0b615
Fix
MNikoliCC Jan 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/snap-creation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ jobs:
sudo apt install xvfb
export DISPLAY=:99
Xvfb :99 -screen 0 1024x768x16 &
- name: Start tmate session (Debugging)
if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
uses: mxschmitt/action-tmate@v3
- name: Create Snap Package
run: |
sudo lsb_release -a
sudo snapcraft --destructive-mode
cp *.snap webots/distribution
- name: Start tmate session (Debugging)
if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
uses: mxschmitt/action-tmate@v3
- uses: actions/upload-artifact@v4
if: ${{ contains(github.event.pull_request.labels.*.name, 'test creation') || github.event_name == 'workflow_dispatch'}}
with:
Expand Down
19 changes: 18 additions & 1 deletion snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ parts:
- ibus-gtk3
- libibus-1.0-5
- fcitx-frontend-gtk3
- adwaita-icon-theme-full
- libgdk-pixbuf2.0-bin

webots:
build-packages:
Expand All @@ -102,16 +104,24 @@ parts:
override-pull: |
craftctl default
./scripts/install/linux_optional_compilation_dependencies.sh
pip3 install --no-input aqtinstall
export PATH="$PATH:$HOME/.local/bin"
sudo apt install --yes xvfb
override-prime: |
craftctl default
rm -vf usr/lib/jvm/java-11-openjdk-*amd64/lib/security/blacklisted.certs
if [ -d "$SNAPCRAFT_PRIME/usr/share/mime/packages" ]; then
update-mime-database $SNAPCRAFT_PRIME/usr/share/mime
fi
mkdir -p $SNAPCRAFT_PRIME/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0
stage-packages:
- openjdk-18-jdk
- ca-certificates-java
- build-essential
- libc6-dev
- ffmpeg
- libavcodec-extra
- libblas3
- freeglut3-dev
- libaribb24-0
- libasn1-8-heimdal
Expand Down Expand Up @@ -226,13 +236,18 @@ parts:
- lsb-release
- util-linux
- zlib1g
- libgdk-pixbuf2.0-0
- librsvg2-common
- shared-mime-info

apps:
webots:
environment:
LANG: C.UTF-8
LC_ALL: C.UTF-8
DISABLE_WAYLAND: 1
PATH: $SNAP/usr/bin:$PATH
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
plugs:
- audio-playback
- browser-support
Expand All @@ -243,7 +258,9 @@ apps:
- joystick
- network
- unity7
- opengl
- removable-media
desktop: usr/share/webots/resources/webots.desktop
command-chain:
- bin/desktop-launch
command: usr/share/webots/webots
command: usr/share/webots/webots