Skip to content

Commit

Permalink
Merge pull request #644 from k-okada/update_readme_for_system_package
Browse files Browse the repository at this point in the history
  • Loading branch information
k-okada authored Feb 9, 2025
2 parents a2f4e87 + 9bddd58 commit c633d33
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 9 deletions.
43 changes: 38 additions & 5 deletions .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ jobs:
- DOCKER_IMAGE: debian:stretch
- DOCKER_IMAGE: osrf/ubuntu_armhf:trusty
- DOCKER_IMAGE: osrf/ubuntu_armhf:xenial
# - DOCKER_IMAGE: osrf/ubuntu_arm64:trusty # deprecated
- DOCKER_IMAGE: osrf/ubuntu_arm64:xenial
- DOCKER_IMAGE: arm64v8/ubuntu:bionic
- DOCKER_IMAGE: arm64v8/ubuntu:focal
- DOCKER_IMAGE: osrf/debian_arm64:stretch
fail-fast: false

runs-on: ubuntu-latest
Expand All @@ -52,6 +47,43 @@ jobs:
echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME"
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"
linux-arm:
strategy:
matrix:
include:
- DOCKER_IMAGE: arm64v8/ubuntu:xenial
- DOCKER_IMAGE: arm64v8/ubuntu:bionic
- DOCKER_IMAGE: arm64v8/ubuntu:focal
- DOCKER_IMAGE: arm64v8/ubuntu:jammy
- DOCKER_IMAGE: arm64v8/ubuntu:noble
- DOCKER_IMAGE: arm64v8/debian:stretch
- DOCKER_IMAGE: arm64v8/debian:buster
- DOCKER_IMAGE: arm64v8/debian:bullseye
- DOCKER_IMAGE: arm64v8/debian:bookworm
- DOCKER_IMAGE: arm64v8/debian:trixie
- DOCKER_IMAGE: arm64v8/debian:sid
fail-fast: false

runs-on: ubuntu-24.04-arm
timeout-minutes: 90

name: linux-arm

steps:
- name: Checkout
uses: actions/checkout@v2
- name: Run test
shell: bash
run: |
set -x
export CI_SOURCE_PATH=$(pwd)
export REPOSITORY_NAME=${PWD##*/}
export TRAVIS_BRANCH=${GITHUB_REF#refs/heads/}
export TRAVIS_OS_NAME=linux
export DOCKER_IMAGE=${{matrix.DOCKER_IMAGE}}
echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME"
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"
catkin:
runs-on: ubuntu-latest
container:
Expand Down Expand Up @@ -145,6 +177,7 @@ jobs:
shell: bash
run: |
set -x
sudo apt-get update -y -qq
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
make
sudo apt-get install -y -qq texlive-binaries texlive-lang-cjk texlive-lang-japanese poppler-utils nkf latex2html
Expand Down
18 changes: 14 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,19 @@ This repository contains software developed and used by [JSK](http://www.jsk.t.u

## 1. Getting started

### 1.1 Install binary (RECOMMENDED: Ubuntu 18.04)
### 1.1 Install from binary

#### 1.1.1 Setup ROS repository
Since Debian 11(Bullseye) / Ubuntu 22.04(jammy), euslisp/jskeus is distributed under official repository.
See https://packages.debian.org/source/euslisp and https://launchpad.net/ubuntu/+source/euslisp

```
sudo apt update
sudo apt install euslisp euslisp-dev jskeus jskeus-dev
```

### 1.2 Install for ROS1(~ Ubuntu 20.04) users

#### 1.2.1 Setup ROS repository

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

### 1.2 Install via Homebrew (OSX)
### 1.3 Install via Homebrew (OSX)
```
brew install euslisp/jskeus/jskeus
```
Expand Down

1 comment on commit c633d33

@k-okada
Copy link
Member Author

@k-okada k-okada commented on c633d33 Feb 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for contributing jskeus documentation

Please check latest documents before merging

PDF version of Japanese jmanual: jmanual.pdf
HTML version of Japanese manual: jmanual.html
Sphinx (ReST) version of Japanese manual: jmanual.rst

Please sign in to comment.