Skip to content

Commit

Permalink
Merge branch 'master' into 836-documentation-of-some-top-level-messag…
Browse files Browse the repository at this point in the history
…es-is-missing
  • Loading branch information
jdsika authored Nov 14, 2024
2 parents 39ff5a1 + 15bc016 commit 38ce53f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ How has it been tested?
#### Take this checklist as orientation for yourself, if this PR is ready for the Change Control Board:
- [ ] My suggestion follows the [style and contributors guidelines](https://opensimulationinterface.github.io/osi-antora-generator/asamosi/latest/specification/contributing/start_contributing.html).
- [ ] I have taken care about the [message documentation](https://opensimulationinterface.github.io/osi-antora-generator/asamosi/latest/specification/contributing/commenting_messages.html) and the [fields and enums documentation](https://opensimulationinterface.github.io/osi-antora-generator/asamosi/latest/specification/contributing/commenting_fields_enums.html).
- [ ] I have done the [DCO signoff](https://opensimulationinterface.github.io/osi-documentation/open-simulation-interface/doc/howtocontribute.html#developer-certification-of-origin-dco).
- [ ] My changes generate no errors when passing CI tests.
- [ ] I have done the [DCO signoff](https://opensimulationinterface.github.io/osi-antora-generator/asamosi/latest/specification/contributing/dco.html).
- [ ] My changes generate no errors when passing CI tests.
- [ ] I have successfully implemented and tested my fix/feature locally.
- [ ] Appropriate reviewer(s) are assigned.

Expand Down
17 changes: 1 addition & 16 deletions .github/workflows/protobuf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
- name: Get git Version
id: get_version
run: echo "VERSION=$(git describe --tags --always)" >> $GITHUB_OUTPUT
run: echo "VERSION=$(git describe --tags --always)" >> $GITHUB_OUTPUT

- name: Prepare Documentation Build
run: |
Expand All @@ -122,28 +122,13 @@ jobs:
- name: Run Python Tests
run: python -m unittest discover tests

- name: Archive Documentation
if: ${{ github.event_name == 'pull_request' }}
uses: actions/upload-artifact@v4
with:
name: linux64-doc
path: doc/html
if-no-files-found: error

- name: Upload Python Distribution
if: ${{ github.event_name == 'pull_request' || ( github.event_name == 'push' && ( github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') ) ) }}
uses: actions/upload-artifact@v4
with:
name: python-dist
path: dist/

- name: Deploy to gh-pages if push to master branch
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./doc/html

build-proto3-linux64:
name: Build Proto3 Linux 64

Expand Down
5 changes: 1 addition & 4 deletions osi_version.proto.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@ package osi3;
// properly set the version components prior to sending.
//
// Increments will happen as part of changes to the whole interface.
// The meaning of different InterfaceVersions is defined in [1].
//
// \par Reference:
// [1] Open Simulation Interface. (2020, January 25). <em>README</em>. Retrieved January 25, 2020, from https://opensimulationinterface.github.io/osi-documentation/open-simulation-interface/README.html
// The meaning of different InterfaceVersions is defined in the versioning chapter of the official OSI documentation.
//
message InterfaceVersion
{
Expand Down

0 comments on commit 38ce53f

Please sign in to comment.