Skip to content

Commit add4e10

Browse files
cgellerRaphvK
andauthored
Update openadsim (#12)
* Update openadsim * Update simulation documentation for scenario execution * switch openadsim to main branch * update openadstack * switch to openadsim github repo * switch submodule to main branch * update openadsim url * remove openadsim under construciton header --------- Co-authored-by: Raphael van Kempen <raphael.vankempen@ika.rwth-aachen.de>
1 parent d8013e6 commit add4e10

6 files changed

Lines changed: 8 additions & 15 deletions

File tree

.github/workflows/sphinx.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,12 @@ jobs:
5050
5151
- name: Update submodules to latest state
5252
env:
53-
GITLAB_OPENADSIM_TOKEN: ${{ secrets.GITLAB_OPENADSIM_TOKEN }}
5453
OPENADSTACK_REF: ${{ inputs.openadstack_ref }}
5554
OPENADSIM_REF: ${{ inputs.openadsim_ref }}
5655
run: |
57-
# Authenticate GitLab access without exposing the token in the submodule URL
58-
git config --global url."https://oauth2:${GITLAB_OPENADSIM_TOKEN}@gitlab.ika.rwth-aachen.de/".insteadOf "https://gitlab.ika.rwth-aachen.de/"
5956
# The runner cannot use the SSH/internal remotes from .gitmodules; use HTTPS repositories instead
6057
git config submodule.docs/openadstack/openadstack.url "https://github.com/openads-project/openadstack.git"
61-
git config submodule.docs/openadsim/openadsim.url "https://gitlab.ika.rwth-aachen.de/fb-fi/its-compositions/simulation-platform.git"
58+
git config submodule.docs/openadsim/openadsim.url "https://github.com/openads-project/openadsim.git"
6259
# When dispatched for a specific submodule branch (e.g. by a repo's trigger workflow), track that
6360
# branch for the submodule so the docs are built from the branch that triggered this run.
6461
if [ -n "${OPENADSTACK_REF}" ]; then

.gitmodules

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@
44
branch = main
55
[submodule "docs/openadsim/openadsim"]
66
path = docs/openadsim/openadsim
7-
url = git@gitlab.ika.rwth-aachen.de:fb-fi/its-compositions/simulation-platform.git
8-
; TODO: change to main
9-
branch = openadsim
7+
url = git@github.com:openads-project/openadsim.git
8+
branch = main

docs/openadsafety/components/simulation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
> [!NOTE]
44
> 🚧 This section is currently under construction.
55
6-
[OpenADSim](../../openadsim/openadsim.md) is a simulation environment for testing the [OpenADStack](../../openadstack/openadstack.md) with different simulators, e.g. the open-source CARLA and SUMO simulators. The [scenario-based testing](../../openadsim/openadsim/docs/example-scenario-testing.md) example demonstrates closed-loop simulation using OpenSCENARIO descriptions.
6+
[OpenADSim](../../openadsim/openadsim.md) is a simulation environment for testing the [OpenADStack](../../openadstack/openadstack.md) with different simulators, e.g. the open-source CARLA and SUMO simulators. The [scenario-execution](../../openadsim/openadsim/docs/example-scenario-execution.md) example demonstrates closed-loop simulation using OpenSCENARIO descriptions.

docs/openadsim/openadsim

docs/openadsim/openadsim.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# 🎮 OpenADSim
22

3-
> [!CAUTION]
4-
> 🚧 This section is currently under construction. The OpenADSim repository will be made available within the next weeks.
5-
63
```{div} align-center
74
[![GitHub](https://img.shields.io/badge/GitHub-openads--project%2Fopenadsim-181717?logo=github)](https://github.com/openads-project/openadsim)
85
```
@@ -12,14 +9,14 @@
129
openadsim/docs/getting-started
1310
openadsim/docs/architecture
1411
openadsim/docs/configuration
15-
openadsim/docs/example-scenario-testing
12+
openadsim/docs/example-scenario-execution
1613
openadsim/docs/example-cooperative-perception
1714
openadsim/docs/example-ml-planning
1815
openadsim/docs/custom-integration
1916
```
2017

2118
```{include} ./openadsim/README.md
22-
:start-after: "# OpenAD**Sim**"
19+
:start-after: "# OpenADSim"
2320
:relative-docs: ./docs
2421
:relative-images:
2522
```

0 commit comments

Comments
 (0)