Skip to content

Commit 4a93dce

Browse files
authored
Merge branch 'master' into feature/ha/traffic-sign-variability-extension
2 parents a0abb62 + 7e6c577 commit 4a93dce

File tree

4 files changed

+36
-7
lines changed

4 files changed

+36
-7
lines changed

.antora/antora.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: asamosi
33
version:
44
# Update version number accordingly. This is the version for the main branch
55
main: 'current'
6+
master: 'current'
67
v(*)-antora: V$1
78
v(*): V$1
89
V(*): V$1
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
2+
name: Antora build trigger
3+
4+
on:
5+
push:
6+
branches: [ master ]
7+
pull_request:
8+
branches: [ master ]
9+
10+
jobs:
11+
trigger_antora:
12+
name: Trigger antora generator
13+
14+
runs-on: Ubuntu-latest
15+
16+
env:
17+
MUP_KEY: ${{ secrets.MACHINE_USER_PAT }}
18+
19+
steps:
20+
- name: Trigger generator
21+
if: ${{ env.MUP_KEY != '' }}
22+
uses: peter-evans/repository-dispatch@v2
23+
with:
24+
token: ${{ secrets.MACHINE_USER_PAT }}
25+
event-type: antora-build-trigger
26+
repository: OpenSimulationInterface/osi-antora-generator
27+
client-payload: '{"src": "${{ github.repository }}", "ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "head_ref": "${{ github.head_ref }}"}'

.github/workflows/protobuf.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
build-proto2-linux64:
1010
name: Build Proto2 Linux 64
1111

12-
runs-on: ubuntu-18.04
12+
runs-on: ubuntu-22.04
1313

1414
steps:
1515
- name: Checkout OSI
@@ -30,10 +30,10 @@ jobs:
3030

3131
- name: Cache Dependencies
3232
id: cache-depends
33-
uses: actions/cache@v2
33+
uses: actions/cache@v3
3434
with:
3535
path: protobuf-3.20.1
36-
key: ${{ runner.os }}-v1-depends
36+
key: ${{ runner.os }}-v2-depends
3737

3838
- name: Download ProtoBuf
3939
if: steps.cache-depends.outputs.cache-hit != 'true'
@@ -100,7 +100,7 @@ jobs:
100100
build-proto3-linux64:
101101
name: Build Proto3 Linux 64
102102

103-
runs-on: ubuntu-18.04
103+
runs-on: ubuntu-22.04
104104

105105
steps:
106106
- name: Checkout OSI
@@ -121,7 +121,7 @@ jobs:
121121
uses: actions/cache@v2
122122
with:
123123
path: protobuf-3.20.1
124-
key: ${{ runner.os }}-v1-depends
124+
key: ${{ runner.os }}-v2-depends
125125

126126
- name: Download ProtoBuf
127127
if: steps.cache-depends.outputs.cache-hit != 'true'

osi_trafficsign.proto

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,9 @@ message TrafficSign
242242
//
243243
message Classification
244244
{
245-
// The traffic sign is not stationary, for example a temporary
246-
// traffic sign in a street construction.
245+
// This value indicates if a sign is static or dynamic regarding its
246+
// content (e.g., electronic sign bridge) and/or regarding its
247+
// position on the road.
247248
//
248249
optional Variability variability = 1;
249250

0 commit comments

Comments
 (0)