Skip to content

Commit

Permalink
Merge pull request #330 from una-auxme/285-feature-document-the-distr…
Browse files Browse the repository at this point in the history
…ibuted-launch-of-the-carla-simulator-and-agent

285 feature document the distributed launch of the carla simulator and agent
  • Loading branch information
JulianTrommer authored Oct 15, 2024
2 parents 7d10c04 + 256f897 commit 59da109
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 10 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build and push image

on:
workflow_run:
workflows: ["Check code format", "Linter markdown and code"]
workflows: ["Check code format"]
types:
- completed

Expand All @@ -12,6 +12,7 @@ env:

jobs:
build-and-push-image:
name: Build and push image
runs-on: self-hosted
outputs:
version: ${{ steps.build.version.outputs.version }}
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/drive.yaml → .github/workflows/drive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ on:
jobs:
drive:
runs-on: self-hosted
needs: build-and-push-image
# run only on pull request for now
if: github.event_name == 'pull_request'
env:
AGENT_VERSION: latest
COMPOSE_FILE: ./build/docker-compose.cicd.yaml
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
name: Check code format

on:
pull_request:
branches:
- "main"
workflow_run:
workflows: ["Linter markdown and code"]
types:
- completed

jobs:
format:
name: Check code files format
name: Check code format
runs-on: ubuntu-latest
steps:
- name: Check out the repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
linter:
name: Lint project files
name: Linter markdown and code
runs-on: ubuntu-latest
steps:
- name: Check out the repo
Expand Down
2 changes: 1 addition & 1 deletion doc/development/distributed_simulation.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ As far as we know, you need more than **10 GB of VRAM** to run the server and th

### Ensure similarity between normal docker-compose and distributed docker-compose files

Carefully compare that their are no major differences between the `docker-compose.yml` and `docker-compose.distributed.yml` files.
Carefully compare that their are no major differences between the `docker-compose.*.yaml` and `docker-compose.*-distributed.yaml` files.
Mainly, the `carla-simulator` service will not be executed in the non-distributed version.

### Set the `<ip-address>` of the carla simulator in docker-compose distributed files
Expand Down

0 comments on commit 59da109

Please sign in to comment.