Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
MNikoliCC committed Dec 4, 2024
1 parent 2ec279d commit 0b7ad92
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 15 deletions.
10 changes: 0 additions & 10 deletions .github/workflows/snap-creation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ jobs:
- uses: actions/checkout@v2
- name: Install Snapcraft
uses: samuelmeuli/action-snapcraft@v1
- name: Install Required Dependencies
run: |
sudo apt update
sudo apt install --yes git xvfb fonts-ubuntu
- name: Clone Webots Repository (build)
run: |
sudo apt install --yes git
Expand All @@ -39,7 +35,6 @@ jobs:
export WEBOTS_VERSION=$(cat webots/scripts/packaging/webots_version.txt | sed 's/ revision /-rev/g')
sed -i "s/version:\s*'R[0-9]\{4\}[a-z].*'/version: '$WEBOTS_VERSION'/g" snapcraft.yaml
sed -i "s/set-version\s*R[0-9]\{4\}[a-z].*/set-version $WEBOTS_VERSION/g" snapcraft.yaml
sed -i "s/ttf-ubuntu-font-family/fonts-ubuntu/g" snapcraft.yaml
- name: Set Commit SHA in Version
if: ${{ github.event_name == 'schedule' }}
run: python webots/scripts/packaging/set_commit_and_date_in_version.py ${{ github.sha }}
Expand Down Expand Up @@ -73,18 +68,13 @@ jobs:
- uses: actions/checkout@v2
- name: Install Snapcraft
uses: samuelmeuli/action-snapcraft@v1
- name: Install Required Dependencies
run: |
sudo apt update
sudo apt install --yes git xvfb fonts-ubuntu
- name: Clone Webots Repository (release-tag)
run: |
sudo apt install --yes git
sudo snap install snapcraft --classic
git clone --recurse-submodules --depth 3 --single-branch --branch ${GITHUB_REF#refs/tags/} https://github.com/cyberbotics/webots.git
export WEBOTS_VERSION=$(cat webots/scripts/packaging/webots_version.txt | sed 's/ revision /-rev/g')
sed -i "s/version:\s*'R[0-9]\{4\}[a-z].*'/version: '$WEBOTS_VERSION'/g" snapcraft.yaml
sed -i "s/ttf-ubuntu-font-family/fonts-ubuntu/g" snapcraft.yaml
- name: Setup Xvfb
run: |
sudo apt install xvfb
Expand Down
9 changes: 4 additions & 5 deletions snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ description: |
actuators and objects are provided, but you can create your own. Collision
detections, rigid body dynamics and fluid dynamics rely on a modified version
of the ODE physics engine. The robot controller programs can be written
outside of Webots in C, C++, Python, ROS, Java or MATLAB using a simple API.
outside of Webots in C, C++, Python, Java or MATLAB using a simple API.
Webots features a 3D web interface allowing you to publish simulations online.
icon: webots.png
license: Apache-2.0
Expand Down Expand Up @@ -58,7 +58,7 @@ parts:
stage:
- -usr/lib/x86_64-linux-gnu/libjpeg.so.8.2.2
stage-packages:
- ttf-ubuntu-font-family
- fonts-ubuntu
- dmz-cursor-theme
- light-themes
- adwaita-icon-theme
Expand All @@ -83,8 +83,7 @@ parts:
plugin: make
build-environment:
- WEBOTS_HOME: "$SNAPCRAFT_PART_BUILD"
- ROS_DISTRO: "noetic"
- JAVA_HOME: "/usr/lib/jvm/java-16-openjdk-amd64"
- JAVA_HOME: "/usr/lib/jvm/java-18-openjdk-amd64"
- PATH: "$JAVA_HOME/bin:$PATH"
#source: https://cyberbotics.com/files/repository/beta/webots.tar.bz2
# When building locally, uncomment the following line:
Expand Down Expand Up @@ -195,7 +194,7 @@ parts:
- libwind0-heimdal
- libx11-data
- libx11-xcb1
- libx265-179
- libx265-199
- libxaw7
- libxcb-glx0
- libxcb-icccm4
Expand Down

0 comments on commit 0b7ad92

Please sign in to comment.