Skip to content

Commit

Permalink
update carlaviz to support carla 0.9.15 (#70)
Browse files Browse the repository at this point in the history
  • Loading branch information
mjxu96 authored Feb 15, 2024
1 parent 1117be2 commit 7697d4d
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
release:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
# git checkout
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Copy .clang-format file
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
# git checkout
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
# dependencies
Expand All @@ -67,25 +67,25 @@ jobs:
matrix:
node-version: [18.x]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Install
uses: borales/actions-yarn@v4
uses: borales/actions-yarn@v5
with:
cmd: install
dir: "frontend"
- name: Build
uses: borales/actions-yarn@v4
uses: borales/actions-yarn@v5
with:
cmd: build
dir: "frontend"

build-docker:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build Docker image
run: docker build -t carlaviz:test .
2 changes: 1 addition & 1 deletion .github/workflows/close_inactive_issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v5
- uses: actions/stale@v9
with:
days-before-issue-stale: 30
days-before-issue-close: 14
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Logs

## 0.9.15
* Support Carla 0.9.15
* Update Github CI/CD actions version

## 0.9.14.1
* Support Carla 0.9.14.1
* Completely rewrite the backend part
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ Visualize carla in the web browser.
## Version Supported
| Platform | Supported Carla Version | Docker/Source |
| ------------- | --------------------- | --- |
| Ubuntu | 0.9.6 - 0.9.14.1| Docker image and source |
| Windows | 0.9.9.2 - 0.9.14.1| Docker image and source |
| Ubuntu | 0.9.6 - 0.9.15| Docker image and source |
| Windows | 0.9.9.2 - 0.9.15| Docker image and source |

## Instructions
### Docker image
Docker image is provided. Run following command to pull this image (including frontend and backend).

```bash
# pull the image based on your carla version
docker pull mjxu96/carlaviz:0.9.14.1
docker pull mjxu96/carlaviz:0.9.15
```

### How to run it?
Expand Down
2 changes: 1 addition & 1 deletion backend/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def requirements(self):
self.requires("spdlog/1.12.0")
self.requires("fmt/9.1.0")
if self.options.simulator == "carla":
self.requires("carla/0.9.14.1")
self.requires("carla/0.9.15")
if self.options.frontend == "xviz":
self.requires("xviz/0.5.1")
# require GeoJson
Expand Down
4 changes: 2 additions & 2 deletions examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ cd CARLA_SIMULATOR_PATH

# 2. run the docker image
# Linux
docker run -it --network="host" mjxu96/carlaviz:0.9.14.1 \
docker run -it --network="host" mjxu96/carlaviz:0.9.15 \
--simulator_host localhost \
--simulator_port 2000

# Windows/MacOS
docker run -it -p 8080-8081:8080-8081 mjxu96/carlaviz:0.9.14.1 \
docker run -it -p 8080-8081:8080-8081 mjxu96/carlaviz:0.9.15 \
--simulator_host host.docker.internal \
--simulator_port 2000

Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "carlaviz_frontend",
"license": "MIT",
"description": "Frontend of CarlaViz",
"version": "0.9.14.1",
"version": "0.9.15",
"scripts": {
"start": "NODE_OPTIONS=--openssl-legacy-provider webpack-dev-server --host 0.0.0.0 --disable-host-check --env.live --progress --hot --open",
"prettier": "prettier --write '{public,src}/**/*.{ts,js,css,html}' index.html",
Expand Down

0 comments on commit 7697d4d

Please sign in to comment.