From 7c10a4a1189d844db4df4b7b60b29a7bf1f5006b Mon Sep 17 00:00:00 2001
From: Philip Windecker <philip.windecker@avenyr.de>
Date: Fri, 14 Oct 2022 17:20:39 +0200
Subject: [PATCH 1/6] Changed version naming for master branch

Signed-off-by: Philip Windecker <philip.windecker@avenyr.de>
---
 .antora/antora.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.antora/antora.yml b/.antora/antora.yml
index e091a64..009e10a 100644
--- a/.antora/antora.yml
+++ b/.antora/antora.yml
@@ -3,6 +3,7 @@ name: asamosi
 version:
   # Update version number accordingly. This is the version for the main branch
   main: 'current'
+  master: 'current'
   v(*)-antora: V$1
   v(*): V$1
   V(*): V$1

From cec4dcae73b59da96e7f7298b03dd29a4a63fb8f Mon Sep 17 00:00:00 2001
From: Philip Windecker <philip.windecker@avenyr.de>
Date: Fri, 14 Oct 2022 17:49:43 +0200
Subject: [PATCH 2/6] build: Updated ubuntu image

Signed-off-by: Philip Windecker <philip.windecker@avenyr.de>
---
 .github/workflows/protobuf.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml
index c001949..ca1f38a 100644
--- a/.github/workflows/protobuf.yml
+++ b/.github/workflows/protobuf.yml
@@ -11,7 +11,7 @@ jobs:
   build-osmp-examples:
     name: Build OSMP examples
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Checkout OSI

From c199497241dcd668a92cbe8014d79d68ed75bac5 Mon Sep 17 00:00:00 2001
From: Philip Windecker <philip.windecker@avenyr.de>
Date: Mon, 17 Oct 2022 10:19:07 +0200
Subject: [PATCH 3/6] Added Antora generator pipeline trigger

Signed-off-by: Philip Windecker <philip.windecker@avenyr.de>
---
 .github/workflows/antora-generator.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/workflows/antora-generator.yml

diff --git a/.github/workflows/antora-generator.yml b/.github/workflows/antora-generator.yml
new file mode 100644
index 0000000..d992ea6
--- /dev/null
+++ b/.github/workflows/antora-generator.yml
@@ -0,0 +1,24 @@
+
+name: Antora build trigger
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  trigger_antora:
+    name: Trigger antora generator
+
+    runs-on: Ubuntu-latest
+
+    steps:
+    - name: Trigger generator
+      uses: peter-evans/repository-dispatch@v2
+      with:
+        token: ${{ secrets.MACHINE_USER_PAT }}
+        event-type: antora-build-trigger
+        repository: OpenSimulationInterface/osi-antora-generator
+        client-payload: '{"src": "${{ github.repository }}", "ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
+        
\ No newline at end of file

From 29ce21eea1095ac27d27b3d5ef64cd6d11258cd3 Mon Sep 17 00:00:00 2001
From: Philip Windecker <philip.windecker@avenyr.de>
Date: Mon, 17 Oct 2022 11:18:16 +0200
Subject: [PATCH 4/6] Update of pipeline cache action and key to force a
 rebuild of protobuf

Signed-off-by: Philip Windecker <philip.windecker@avenyr.de>
---
 .github/workflows/protobuf.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml
index ca1f38a..8b9f311 100644
--- a/.github/workflows/protobuf.yml
+++ b/.github/workflows/protobuf.yml
@@ -27,10 +27,10 @@ jobs:
     # cache dependencies
     - name: Cache Dependencies
       id: cache-depends
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: protobuf-3.15.8
-        key: ${{ runner.os }}-v1-depends
+        key: ${{ runner.os }}-v2-depends
 
     # Download and build protobuf
     - name: Download ProtoBuf

From 3231637491e04844b4cd5ad383c5e0d48ec1217b Mon Sep 17 00:00:00 2001
From: Philip Windecker <philip.windecker@avenyr.de>
Date: Mon, 17 Oct 2022 14:16:34 +0200
Subject: [PATCH 5/6] Added additional information to pipeline trigger

Signed-off-by: Philip Windecker <philip.windecker@avenyr.de>
---
 .github/workflows/antora-generator.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/antora-generator.yml b/.github/workflows/antora-generator.yml
index d992ea6..e5632fa 100644
--- a/.github/workflows/antora-generator.yml
+++ b/.github/workflows/antora-generator.yml
@@ -20,5 +20,5 @@ jobs:
         token: ${{ secrets.MACHINE_USER_PAT }}
         event-type: antora-build-trigger
         repository: OpenSimulationInterface/osi-antora-generator
-        client-payload: '{"src": "${{ github.repository }}", "ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
+        client-payload: '{"src": "${{ github.repository }}", "ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "head_ref": "${{ github.head_ref }}"}'
         
\ No newline at end of file

From 0a9ddf68986aa2887543eeb516ef5eb512938d32 Mon Sep 17 00:00:00 2001
From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com>
Date: Mon, 12 Dec 2022 11:31:04 +0100
Subject: [PATCH 6/6] Update antora-generator.yml

Only trigger generator if the PR has access to the required secrets.
---
 .github/workflows/antora-generator.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/antora-generator.yml b/.github/workflows/antora-generator.yml
index e5632fa..6811b1d 100644
--- a/.github/workflows/antora-generator.yml
+++ b/.github/workflows/antora-generator.yml
@@ -12,13 +12,17 @@ jobs:
     name: Trigger antora generator
 
     runs-on: Ubuntu-latest
-
+    
+    env:
+      MUP_KEY: ${{ secrets.MACHINE_USER_PAT }}
+    
     steps:
     - name: Trigger generator
+      if: ${{ env.MUP_KEY != '' }}
       uses: peter-evans/repository-dispatch@v2
       with:
         token: ${{ secrets.MACHINE_USER_PAT }}
         event-type: antora-build-trigger
         repository: OpenSimulationInterface/osi-antora-generator
         client-payload: '{"src": "${{ github.repository }}", "ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "head_ref": "${{ github.head_ref }}"}'
-        
\ No newline at end of file
+