From cfea45b03175ae06bbe5a3d4c5dff7b1f417928a Mon Sep 17 00:00:00 2001 From: Philip Windecker Date: Fri, 14 Oct 2022 17:20:13 +0200 Subject: [PATCH 1/8] Changed version naming for master branch Signed-off-by: Philip Windecker --- .antora/antora.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.antora/antora.yml b/.antora/antora.yml index e091a6471..009e10a9d 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 03e110054a32cda093d1e6c38f4261ebbecc4083 Mon Sep 17 00:00:00 2001 From: Philip Windecker Date: Fri, 14 Oct 2022 17:49:32 +0200 Subject: [PATCH 2/8] build: Updated ubuntu image Signed-off-by: Philip Windecker --- .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 a7acae918..284d819af 100644 --- a/.github/workflows/protobuf.yml +++ b/.github/workflows/protobuf.yml @@ -9,7 +9,7 @@ jobs: build-proto2-linux64: name: Build Proto2 Linux 64 - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - name: Checkout OSI @@ -100,7 +100,7 @@ jobs: build-proto3-linux64: name: Build Proto3 Linux 64 - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - name: Checkout OSI From cf83918d5068da8dc3d79dd1476efb11fe4a7893 Mon Sep 17 00:00:00 2001 From: Philip Windecker Date: Mon, 17 Oct 2022 09:57:32 +0200 Subject: [PATCH 3/8] Added new antora generator trigger Signed-off-by: Philip Windecker --- .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 000000000..6becceff3 --- /dev/null +++ b/.github/workflows/antora-generator.yml @@ -0,0 +1,24 @@ + +name: Antora build trigger + +on: + push: + branches: [ master, build/master-branch-naming ] + 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 cedc04c5821ebf87a76694d47a44f3d0a3edaf85 Mon Sep 17 00:00:00 2001 From: Philip Windecker Date: Mon, 17 Oct 2022 10:18:06 +0200 Subject: [PATCH 4/8] Removed test branch from "on" keyword Signed-off-by: Philip Windecker --- .github/workflows/antora-generator.yml | 2 +- asciidoc-resources | 1 + style-resources | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 160000 asciidoc-resources create mode 160000 style-resources diff --git a/.github/workflows/antora-generator.yml b/.github/workflows/antora-generator.yml index 6becceff3..d992ea690 100644 --- a/.github/workflows/antora-generator.yml +++ b/.github/workflows/antora-generator.yml @@ -3,7 +3,7 @@ name: Antora build trigger on: push: - branches: [ master, build/master-branch-naming ] + branches: [ master ] pull_request: branches: [ master ] diff --git a/asciidoc-resources b/asciidoc-resources new file mode 160000 index 000000000..4baff8cdb --- /dev/null +++ b/asciidoc-resources @@ -0,0 +1 @@ +Subproject commit 4baff8cdb3a27760d9e188dbacf56b8862ecc154 diff --git a/style-resources b/style-resources new file mode 160000 index 000000000..4baff8cdb --- /dev/null +++ b/style-resources @@ -0,0 +1 @@ +Subproject commit 4baff8cdb3a27760d9e188dbacf56b8862ecc154 From d94a2e97a4701a43f894a078684072e636c893f4 Mon Sep 17 00:00:00 2001 From: Philip Windecker Date: Mon, 17 Oct 2022 10:51:24 +0200 Subject: [PATCH 5/8] Removed broken references to deleted submodules Signed-off-by: Philip Windecker --- asciidoc-resources | 1 - style-resources | 1 - 2 files changed, 2 deletions(-) delete mode 160000 asciidoc-resources delete mode 160000 style-resources diff --git a/asciidoc-resources b/asciidoc-resources deleted file mode 160000 index 4baff8cdb..000000000 --- a/asciidoc-resources +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4baff8cdb3a27760d9e188dbacf56b8862ecc154 diff --git a/style-resources b/style-resources deleted file mode 160000 index 4baff8cdb..000000000 --- a/style-resources +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4baff8cdb3a27760d9e188dbacf56b8862ecc154 From 9ba6144c8e996d9e622c3f8d8921a3258337d2ed Mon Sep 17 00:00:00 2001 From: Philip Windecker Date: Mon, 17 Oct 2022 11:18:12 +0200 Subject: [PATCH 6/8] Update of pipeline cache action and key to force a rebuild of protobuf Signed-off-by: Philip Windecker --- .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 284d819af..fa5554f55 100644 --- a/.github/workflows/protobuf.yml +++ b/.github/workflows/protobuf.yml @@ -30,10 +30,10 @@ jobs: - name: Cache Dependencies id: cache-depends - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: protobuf-3.20.1 - key: ${{ runner.os }}-v1-depends + key: ${{ runner.os }}-v2-depends - name: Download ProtoBuf if: steps.cache-depends.outputs.cache-hit != 'true' From eec8ccd41ad2734c4c56c2c9c92558838437249b Mon Sep 17 00:00:00 2001 From: Philip Windecker Date: Mon, 17 Oct 2022 11:20:49 +0200 Subject: [PATCH 7/8] Fixed outdated cache dependency for protobuf 3 Signed-off-by: Philip Windecker --- .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 fa5554f55..c719a68ce 100644 --- a/.github/workflows/protobuf.yml +++ b/.github/workflows/protobuf.yml @@ -121,7 +121,7 @@ jobs: uses: actions/cache@v2 with: path: protobuf-3.20.1 - key: ${{ runner.os }}-v1-depends + key: ${{ runner.os }}-v2-depends - name: Download ProtoBuf if: steps.cache-depends.outputs.cache-hit != 'true' From 567b122e17fc9d6e90a9ae815bfc37f7a9d7ac7d Mon Sep 17 00:00:00 2001 From: Philip Windecker Date: Mon, 17 Oct 2022 14:16:30 +0200 Subject: [PATCH 8/8] Added additional information to pipeline trigger Signed-off-by: Philip Windecker --- .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 d992ea690..e5632fa1c 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