Skip to content

Commit c633d33

Browse files
authored
Merge pull request #644 from k-okada/update_readme_for_system_package
add how to install as System package, see https://bugs.launchpad.net/ubuntu/+source/euslisp/+bug/2096808/comments/8
2 parents a2f4e87 + 9bddd58 commit c633d33

File tree

2 files changed

+52
-9
lines changed

2 files changed

+52
-9
lines changed

.github/workflows/config.yml

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ jobs:
2323
- DOCKER_IMAGE: debian:stretch
2424
- DOCKER_IMAGE: osrf/ubuntu_armhf:trusty
2525
- DOCKER_IMAGE: osrf/ubuntu_armhf:xenial
26-
# - DOCKER_IMAGE: osrf/ubuntu_arm64:trusty # deprecated
27-
- DOCKER_IMAGE: osrf/ubuntu_arm64:xenial
28-
- DOCKER_IMAGE: arm64v8/ubuntu:bionic
29-
- DOCKER_IMAGE: arm64v8/ubuntu:focal
30-
- DOCKER_IMAGE: osrf/debian_arm64:stretch
3126
fail-fast: false
3227

3328
runs-on: ubuntu-latest
@@ -52,6 +47,43 @@ jobs:
5247
echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME"
5348
docker run $PLATFORM_OPTION --rm $QEMU_VOLUME -v $CI_SOURCE_PATH:$CI_SOURCE_PATH -e "DOCKER_IMAGE=$DOCKER_IMAGE" -e "COLLISION_LIB=$COLLISION_LIB" -e "CI_SOURCE_PATH=$CI_SOURCE_PATH" -e "HOME=$HOME" -t $DOCKER_IMAGE sh -c "cd $CI_SOURCE_PATH; ./.travis.sh"
5449
50+
linux-arm:
51+
strategy:
52+
matrix:
53+
include:
54+
- DOCKER_IMAGE: arm64v8/ubuntu:xenial
55+
- DOCKER_IMAGE: arm64v8/ubuntu:bionic
56+
- DOCKER_IMAGE: arm64v8/ubuntu:focal
57+
- DOCKER_IMAGE: arm64v8/ubuntu:jammy
58+
- DOCKER_IMAGE: arm64v8/ubuntu:noble
59+
- DOCKER_IMAGE: arm64v8/debian:stretch
60+
- DOCKER_IMAGE: arm64v8/debian:buster
61+
- DOCKER_IMAGE: arm64v8/debian:bullseye
62+
- DOCKER_IMAGE: arm64v8/debian:bookworm
63+
- DOCKER_IMAGE: arm64v8/debian:trixie
64+
- DOCKER_IMAGE: arm64v8/debian:sid
65+
fail-fast: false
66+
67+
runs-on: ubuntu-24.04-arm
68+
timeout-minutes: 90
69+
70+
name: linux-arm
71+
72+
steps:
73+
- name: Checkout
74+
uses: actions/checkout@v2
75+
- name: Run test
76+
shell: bash
77+
run: |
78+
set -x
79+
export CI_SOURCE_PATH=$(pwd)
80+
export REPOSITORY_NAME=${PWD##*/}
81+
export TRAVIS_BRANCH=${GITHUB_REF#refs/heads/}
82+
export TRAVIS_OS_NAME=linux
83+
export DOCKER_IMAGE=${{matrix.DOCKER_IMAGE}}
84+
echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME"
85+
docker run --rm $QEMU_VOLUME -v $CI_SOURCE_PATH:$CI_SOURCE_PATH -e "DOCKER_IMAGE=$DOCKER_IMAGE" -e "COLLISION_LIB=$COLLISION_LIB" -e "CI_SOURCE_PATH=$CI_SOURCE_PATH" -e "HOME=$HOME" -t $DOCKER_IMAGE sh -c "cd $CI_SOURCE_PATH; ./.travis.sh"
86+
5587
catkin:
5688
runs-on: ubuntu-latest
5789
container:
@@ -145,6 +177,7 @@ jobs:
145177
shell: bash
146178
run: |
147179
set -x
180+
sudo apt-get update -y -qq
148181
sudo apt-get install -y -qq git make gcc g++ libjpeg-dev libxext-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev libpq-dev libpng-dev xfonts-100dpi xfonts-75dpi pkg-config libbullet-dev
149182
make
150183
sudo apt-get install -y -qq texlive-binaries texlive-lang-cjk texlive-lang-japanese poppler-utils nkf latex2html

README.md

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,19 @@ This repository contains software developed and used by [JSK](http://www.jsk.t.u
77

88
## 1. Getting started
99

10-
### 1.1 Install binary (RECOMMENDED: Ubuntu 18.04)
10+
### 1.1 Install from binary
1111

12-
#### 1.1.1 Setup ROS repository
12+
Since Debian 11(Bullseye) / Ubuntu 22.04(jammy), euslisp/jskeus is distributed under official repository.
13+
See https://packages.debian.org/source/euslisp and https://launchpad.net/ubuntu/+source/euslisp
14+
15+
```
16+
sudo apt update
17+
sudo apt install euslisp euslisp-dev jskeus jskeus-dev
18+
```
19+
20+
### 1.2 Install for ROS1(~ Ubuntu 20.04) users
21+
22+
#### 1.2.1 Setup ROS repository
1323

1424
Please set `ROS_DISTRO` environment variable to your ROS distro. For example, if you use 18.04, run `export ROS_DISTRO=melodic`.
1525
```
@@ -18,12 +28,12 @@ wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
1828
echo "source /opt/ros/$ROS_DISTRO/setup.bash" >> ~/.bashrc
1929
sudo apt-get update
2030
```
21-
#### 1.1.2 Install Euslisp
31+
#### 1.2.2 Install Euslisp
2232
```
2333
sudo apt-get install ros-$ROS_DISTRO-euslisp
2434
```
2535

26-
### 1.2 Install via Homebrew (OSX)
36+
### 1.3 Install via Homebrew (OSX)
2737
```
2838
brew install euslisp/jskeus/jskeus
2939
```

0 commit comments

Comments
 (0)