Skip to content

Commit 6f3f287

Browse files
authored
Merge pull request #81 from OpenSimulationInterface/80-consolidate-hosted-osi-documentation-sources
80 consolidate hosted osi documentation sources
2 parents 0d44982 + 283ac76 commit 6f3f287

File tree

4 files changed

+18
-115
lines changed

4 files changed

+18
-115
lines changed

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ Add @mentions of the person or team responsible for reviewing proposed changes.
1818
- [ ] I have performed a self-review of my own code/documentation.
1919
- [ ] My documentation changes are related to another repository in the organization. Here is the link to the issue/repo.
2020
- [ ] My changes generate no new warnings during the documentation generation.
21-
- [ ] The existing travis ci which pushes the documentation to gh-pages passes with my changes.
21+
- [ ] The Antora pipeline which pushes the documentation to gh-pages on the downstream repository passes with my changes.

.github/workflows/asciidoc-build.yml

Lines changed: 0 additions & 90 deletions
This file was deleted.

README.adoc

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,27 @@
11
= OSI Documentation
22

3-
This repo hosts the AsciiDoc-based part of the documentation.
3+
This repo contains most of the general AsciiDoc-based part of the documentation.
44
It contains generals parts of the content and a CI-pipeline that renders the document with Antora.
55

6-
// TODO: Update if Asciidoctor is completely dropped!
6+
NOTE: The actual hosting has been moved to the generator repository (see link below).
77

88
== ASAM OSI (R) official documentation
99

1010
See the documentation https://opensimulationinterface.github.io/osi-antora-generator/asamosi/latest/specification/index.html[here].
1111

1212

13-
== Build pipeline
14-
// === Asciidoctor pipeline
15-
16-
// The Asciidoctor pipline is no longer active, see Antora pipeline.
17-
18-
// image::https://github.com/OpenSimulationInterface/osi-documentation/actions/workflows/asciidoc-build.yml/badge.svg[link=https://github.com/OpenSimulationInterface/osi-documentation/actions/workflows/asciidoc-build.yml]
19-
20-
// The pipeline collects the documentation from both https://github.com/OpenSimulationInterface/open-simulation-interface[open-simulation-interface] and https://github.com/OpenSimulationInterface/osi-sensor-model-packaging[osi-sensor-model-packaging] and integrates it into skeleton of this repo.
21-
// As with all ASAM Asciidoctor projects, the complete document structure is described in the mapping file https://github.com/OpenSimulationInterface/osi-documentation/blob/master/index.adoc[index.adoc].
22-
23-
=== Antora pipeline
13+
== Antora build pipeline
2414
image::https://github.com/OpenSimulationInterface/osi-antora-generator/actions/workflows/site-build.yml/badge.svg?branch=main[link=https://github.com/OpenSimulationInterface/osi-antora-generator/actions/workflows/site-build.yml]
2515

2616
NOTE: This pipeline runs on https://github.com/OpenSimulationInterface/osi-antora-generator.
2717

28-
2918
== How To build and change documentation locally
3019

31-
IMPORTANT: These instructions relate ONLY to the Asciidoctor build.
20+
IMPORTANT: These instructions relate ONLY to the Asciidoctor build.
3221
For Antora, check the https://github.com/OpenSimulationInterface/osi-antora-generator[ASAM OSI Antora generator].
3322

3423

35-
The following instructions show how to build the document locally.
24+
The following instructions show how to build the document locally.
3625
Take note that the document is built with a version 'localbuild' in the document and filename.
3726

3827
The instruction should work on Windows, Linux, and MacOS.
@@ -41,7 +30,7 @@ The instruction should work on Windows, Linux, and MacOS.
4130
+
4231
TIP: Official installation can be found https://docs.docker.com/get-docker/[here].
4332

44-
. Clone this repository with submodules.
33+
. Clone this repository with submodules.
4534
+
4635
[source, shell]
4736
----
@@ -63,17 +52,17 @@ git clone https://github.com/OpenSimulationInterface/osi-sensor-model-packaging.
6352
[source, yaml]
6453
----
6554
version: "2"
66-
67-
services:
55+
56+
services:
6857
asciidoctor:
6958
image: asciidoctor/docker-asciidoctor:1
70-
volumes:
59+
volumes:
7160
- .:/documents
7261
working_dir: /documents
7362
entrypoint: asciidoctor -D . --failure-level WARN -r asciidoctor-bibtex -r asciidoctor-diagram -a mathjax --trace --backend=html5 index.adoc -o open-simulation-interface_localbuild.html
7463
----
7564

76-
. Run
65+
. Run
7766
+
7867
[source, shell]
7968
----

content/general_docs/osi_repos.adoc

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,14 @@ OSI and its supporting tools are developed publicly on GitHub.
1111
The source code and documentation for OSI and OSI-related tools are spread over several repositories:
1212

1313
https://github.com/OpenSimulationInterface/open-simulation-interface[open-simulation-interface]::
14-
Main repository containing the interface description based on Google's Protocol Buffers, including helper scripts and test scripts. Hosts the .proto files as well as the https://opensimulationinterface.github.io/open-simulation-interface/[Doxygen reference documentation].
14+
Main repository containing the interface description based on Google's Protocol Buffers, including helper scripts and test scripts.
15+
Hosts the .proto files.
1516

16-
https://github.com/OpenSimulationInterface/osi-documentation[osi-documentation]:: Source for the OSI user guide sources and hosts the https://opensimulationinterface.github.io/osi-documentation/[{THIS_STANDARD} user guide].
17+
https://github.com/OpenSimulationInterface/osi-documentation[osi-documentation]:: Source for the AsciiDoc files used to compile the general chapters of the OSI documentation.
1718

1819
https://github.com/OpenSimulationInterface/osi-sensor-model-packaging[osi-sensor-model-packaging]:: Packaging specification for OSI models used in FMI 2.0 cite:[fmi2.0] simulation environments, including examples.
1920

20-
https://github.com/OpenSimulationInterface/proto2cpp[proto2cpp]:: Doxygen filter for creating the reference documentation from OSI .proto files.
21+
https://github.com/OpenSimulationInterface/proto2cpp[proto2cpp]:: Doxygen filter for creating the reference documentation from OSI .proto files.
22+
23+
https://github.com/OpenSimulationInterface/osi-antora-generator[osi-antora-generator]:: Contains the Antora generator and the relevant pipeline.
24+
This repository is responsible for both building and hosting the https://opensimulationinterface.github.io/osi-antora-generator/asamosi/latest/specification/index.html/[{THIS_STANDARD} Specification^] as well as the https://opensimulationinterface.github.io/osi-antora-generator/asamosi/latest/gen/index.html[{THIS_STANDARD} Reference Documentation^].

0 commit comments

Comments
 (0)