Skip to content

Commit 591d452

Browse files
authored
Merge pull request #88 from OpenSimulationInterface/build/master-branch-renaming
Build/master branch renaming
2 parents 1241cec + 0a9ddf6 commit 591d452

File tree

3 files changed

+32
-3
lines changed

3 files changed

+32
-3
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: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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 }}"}'
28+

.github/workflows/protobuf.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
build-osmp-examples:
1212
name: Build OSMP examples
1313

14-
runs-on: ubuntu-18.04
14+
runs-on: ubuntu-22.04
1515

1616
steps:
1717
- name: Checkout OSI
@@ -27,10 +27,10 @@ jobs:
2727
# cache dependencies
2828
- name: Cache Dependencies
2929
id: cache-depends
30-
uses: actions/cache@v2
30+
uses: actions/cache@v3
3131
with:
3232
path: protobuf-3.15.8
33-
key: ${{ runner.os }}-v1-depends
33+
key: ${{ runner.os }}-v2-depends
3434

3535
# Download and build protobuf
3636
- name: Download ProtoBuf

0 commit comments

Comments
 (0)