From 9e6de77c3e5e95989eeb1da301b1330674fd4b07 Mon Sep 17 00:00:00 2001 From: Philip Windecker Date: Fri, 21 Oct 2022 14:32:30 +0200 Subject: [PATCH 01/55] First set of release pipeline steps Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 80 +++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..d3002dd6a --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,80 @@ +name: GitHub Release Pipeline + +on: + release: + types: [released] + +jobs: + setup: + name: Setup variables + runs-on: ubuntu-latest + steps: + - name: Set vars + run: VERSION=$(git describe --tags --always | sed 's/^v//') + + antora: + name: Generate Antora content + runs-on: ubuntu-22.04 + steps: + - name: Checkout Antora generator + uses: actions/checkout@v3 + with: + repository: OpenSimulationInterface/osi-antora-generator + path: antora + + - name: Manipulate site.yml + working_directory: antora + run: sed -i -E 's/branches: (.*) \# (open-.*|osi-.*)//g' site.yml + + - name: Run Antora + uses: docker://ghcr.io/asam-ev/project-guide-docker:4 + with: + entrypoint: sh + args: antora/run-build.sh + + deliverables: + name: Create deliverables package + runs-on: ubuntu-latest + steps: + - name: Checkout interface + uses: actions/checkout@v3 + with: + path: dist/open-simulation-interface + + - name: Checkout sensor model packaging + uses: actions/checkout@v3 + with: + repository: OpenSimulationInterface/osi-sensor-model-packaging + path: dist/osi-sensor-model-packaging + + - name: Create README + working_directory: dist + run: echo "/********************************************************************************** + *** ASAM OSI *** + *** Version : $VERSION *** + *** Date: $(cat DOCDATE) *** + **********************************************************************************/ + + the deliverables of ASAM OSI $VERSION include: + + - ASAM_OSI_Standard_$VERSION + - open_simulation_interface_$VERSION + - osi-sensor-model-packaging_$VERSION" > "ASAM_OSI_$VERSION/README.txt" + + - name: Create deliverables package + uses: actions/upload-artifact@v3 + with: + name: deliverables + path: dist + + + + publish: + name: Add deliverables to release + runs-on: ubuntu-latest + steps: + - name: Add deliverables to release + uses: irongut/EditRelease@v1.2.0 + with: + id: ${{ github.event.release.id }} + files: "deliverables.zip" \ No newline at end of file From d797b4f154ae3af89c04b45afddd9160dc050209 Mon Sep 17 00:00:00 2001 From: Philip Windecker Date: Fri, 21 Oct 2022 14:34:13 +0200 Subject: [PATCH 02/55] fix step w/ sed Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d3002dd6a..48126ca36 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,8 @@ jobs: - name: Manipulate site.yml working_directory: antora - run: sed -i -E 's/branches: (.*) \# (open-.*|osi-.*)//g' site.yml + run: | + sed -i -E 's/branches: (.*) \# (open-.*|osi-.*)//g' site.yml - name: Run Antora uses: docker://ghcr.io/asam-ev/project-guide-docker:4 From be946b3241c3a85f25e5aa0a5f30ff993555880d Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 21 Oct 2022 14:35:28 +0200 Subject: [PATCH 03/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 48126ca36..6ee10b82a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: path: antora - name: Manipulate site.yml - working_directory: antora + working-directory: antora run: | sed -i -E 's/branches: (.*) \# (open-.*|osi-.*)//g' site.yml @@ -49,8 +49,9 @@ jobs: path: dist/osi-sensor-model-packaging - name: Create README - working_directory: dist - run: echo "/********************************************************************************** + working-directory: dist + run: | + echo "/********************************************************************************** *** ASAM OSI *** *** Version : $VERSION *** *** Date: $(cat DOCDATE) *** @@ -78,4 +79,4 @@ jobs: uses: irongut/EditRelease@v1.2.0 with: id: ${{ github.event.release.id }} - files: "deliverables.zip" \ No newline at end of file + files: "deliverables.zip" From 8de86468755a12ceb86f2cb076bbb130ceeb4839 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 21 Oct 2022 14:42:50 +0200 Subject: [PATCH 04/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6ee10b82a..25b107741 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,11 +31,12 @@ jobs: uses: docker://ghcr.io/asam-ev/project-guide-docker:4 with: entrypoint: sh - args: antora/run-build.sh + args: antora/antora --stacktrace --fetch --clean site.yml deliverables: name: Create deliverables package runs-on: ubuntu-latest + needs: [setup,antora] steps: - name: Checkout interface uses: actions/checkout@v3 @@ -74,6 +75,7 @@ jobs: publish: name: Add deliverables to release runs-on: ubuntu-latest + needs: [deliverables] steps: - name: Add deliverables to release uses: irongut/EditRelease@v1.2.0 From 19bb88578abcfc7f6f2aac1864141e01dc560b47 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 21 Oct 2022 14:46:10 +0200 Subject: [PATCH 05/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 25b107741..76becaab9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: uses: docker://ghcr.io/asam-ev/project-guide-docker:4 with: entrypoint: sh - args: antora/antora --stacktrace --fetch --clean site.yml + args: cd antora && antora --stacktrace --fetch --clean site.yml deliverables: name: Create deliverables package From 1ab5cc8331668c9c5a28807d1f5d4fbf018d421c Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 21 Oct 2022 15:03:44 +0200 Subject: [PATCH 06/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 76becaab9..ca37f1eff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,11 +27,15 @@ jobs: run: | sed -i -E 's/branches: (.*) \# (open-.*|osi-.*)//g' site.yml + - name: Create run instructions + run: echo "#!/bin/bash\n\ncd antora\nexec antora --stacktrace --fetch --clean site.yml" > antora.sh + - name: Run Antora uses: docker://ghcr.io/asam-ev/project-guide-docker:4 with: entrypoint: sh - args: cd antora && antora --stacktrace --fetch --clean site.yml + args: antora.sh + deliverables: name: Create deliverables package From 78c7781e7900670a79487e5c739fd495a37f07f8 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 21 Oct 2022 15:51:25 +0200 Subject: [PATCH 07/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ca37f1eff..0e67333a3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,6 +11,8 @@ jobs: steps: - name: Set vars run: VERSION=$(git describe --tags --always | sed 's/^v//') + outputs: + VERSION: $VERSION antora: name: Generate Antora content @@ -58,15 +60,15 @@ jobs: run: | echo "/********************************************************************************** *** ASAM OSI *** - *** Version : $VERSION *** + *** Version : ${{ needs.setup.outputs.VERSION }} *** *** Date: $(cat DOCDATE) *** **********************************************************************************/ the deliverables of ASAM OSI $VERSION include: - - ASAM_OSI_Standard_$VERSION - - open_simulation_interface_$VERSION - - osi-sensor-model-packaging_$VERSION" > "ASAM_OSI_$VERSION/README.txt" + - ASAM_OSI_Standard_${{ needs.setup.outputs.VERSION }} + - open_simulation_interface_${{ needs.setup.outputs.VERSION }} + - osi-sensor-model-packaging_${{ needs.setup.outputs.VERSION }}" > "ASAM_OSI_${{ needs.setup.outputs.VERSION }}/README.txt" - name: Create deliverables package uses: actions/upload-artifact@v3 From a2be812d13d941db1a318700d1b6213d3ea3cc54 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 21 Oct 2022 15:56:52 +0200 Subject: [PATCH 08/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0e67333a3..c367f3701 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,15 +9,20 @@ jobs: name: Setup variables runs-on: ubuntu-latest steps: + - name: Checkout interface + uses: actions/checkout@v3 + with: + path: dist/open-simulation-interface - name: Set vars - run: VERSION=$(git describe --tags --always | sed 's/^v//') + working-directory: dist/open-simulation-interface + run: VERSION=$(git describe --tags --always | sed 's/^v//') && echo $VERSION outputs: VERSION: $VERSION antora: name: Generate Antora content runs-on: ubuntu-22.04 - steps: + steps: - name: Checkout Antora generator uses: actions/checkout@v3 with: @@ -44,10 +49,10 @@ jobs: runs-on: ubuntu-latest needs: [setup,antora] steps: - - name: Checkout interface - uses: actions/checkout@v3 - with: - path: dist/open-simulation-interface +# - name: Checkout interface +# uses: actions/checkout@v3 +# with: +# path: dist/open-simulation-interface - name: Checkout sensor model packaging uses: actions/checkout@v3 @@ -68,7 +73,7 @@ jobs: - ASAM_OSI_Standard_${{ needs.setup.outputs.VERSION }} - open_simulation_interface_${{ needs.setup.outputs.VERSION }} - - osi-sensor-model-packaging_${{ needs.setup.outputs.VERSION }}" > "ASAM_OSI_${{ needs.setup.outputs.VERSION }}/README.txt" + - osi-sensor-model-packaging_${{ needs.setup.outputs.VERSION }}" > "README.txt" - name: Create deliverables package uses: actions/upload-artifact@v3 From 82be0ee85ceef647080bdd7e33fca701cff2937b Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 21 Oct 2022 16:07:54 +0200 Subject: [PATCH 09/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c367f3701..4c2f5d720 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -75,21 +75,31 @@ jobs: - open_simulation_interface_${{ needs.setup.outputs.VERSION }} - osi-sensor-model-packaging_${{ needs.setup.outputs.VERSION }}" > "README.txt" + - name: Zip Release + uses: TheDoctor0/zip-release@0.6.2 + with: + filename: ASAM_OSI_${{ needs.setup.outputs.VERSION }}.zip + path: dist + - name: Create deliverables package uses: actions/upload-artifact@v3 with: name: deliverables - path: dist - - + path: dist/ASAM_OSI_${{ needs.setup.outputs.VERSION }}.zip publish: name: Add deliverables to release runs-on: ubuntu-latest needs: [deliverables] steps: + - name: Retrieve previous artifacts + uses: actions/download-artifacts@v3 + with: + name: deliverables + - name: Add deliverables to release uses: irongut/EditRelease@v1.2.0 with: + token: ${{ secrets.GITHUB_TOKEN }} id: ${{ github.event.release.id }} - files: "deliverables.zip" + files: "ASAM_OSI_${{ needs.setup.outputs.VERSION }}.zip" From 6204694d9063d0d10d81730edb972f267bc9cdb4 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 21 Oct 2022 16:18:08 +0200 Subject: [PATCH 10/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4c2f5d720..04c9d0d56 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,10 +14,13 @@ jobs: with: path: dist/open-simulation-interface - name: Set vars + id: vars working-directory: dist/open-simulation-interface - run: VERSION=$(git describe --tags --always | sed 's/^v//') && echo $VERSION + run: | + VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT + echo $VERSION outputs: - VERSION: $VERSION + VERSION: ${{ steps.vars.outputs.VERSION }} antora: name: Generate Antora content @@ -63,6 +66,7 @@ jobs: - name: Create README working-directory: dist run: | + echo ${{needs.setup.outputs.VERSION}} echo "/********************************************************************************** *** ASAM OSI *** *** Version : ${{ needs.setup.outputs.VERSION }} *** @@ -74,6 +78,7 @@ jobs: - ASAM_OSI_Standard_${{ needs.setup.outputs.VERSION }} - open_simulation_interface_${{ needs.setup.outputs.VERSION }} - osi-sensor-model-packaging_${{ needs.setup.outputs.VERSION }}" > "README.txt" + cat README.txt - name: Zip Release uses: TheDoctor0/zip-release@0.6.2 @@ -90,7 +95,7 @@ jobs: publish: name: Add deliverables to release runs-on: ubuntu-latest - needs: [deliverables] + needs: [deliverables, setup] steps: - name: Retrieve previous artifacts uses: actions/download-artifacts@v3 From bc805ea289896b44a6ddd44435712306a22e8d4e Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 21 Oct 2022 16:22:05 +0200 Subject: [PATCH 11/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 04c9d0d56..aa93330d5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -86,11 +86,17 @@ jobs: filename: ASAM_OSI_${{ needs.setup.outputs.VERSION }}.zip path: dist + - name: test + run: | + ls -la + cd dist + ls -la + - name: Create deliverables package uses: actions/upload-artifact@v3 with: name: deliverables - path: dist/ASAM_OSI_${{ needs.setup.outputs.VERSION }}.zip + path: ASAM_OSI_${{ needs.setup.outputs.VERSION }}.zip publish: name: Add deliverables to release @@ -98,7 +104,7 @@ jobs: needs: [deliverables, setup] steps: - name: Retrieve previous artifacts - uses: actions/download-artifacts@v3 + uses: actions/download-artifact@v3 with: name: deliverables From ab78f04f613a23a4a9ad47b3e7d5fb2e6eaace4b Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 21 Oct 2022 16:35:54 +0200 Subject: [PATCH 12/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aa93330d5..878985bb7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,28 +45,38 @@ jobs: with: entrypoint: sh args: antora.sh - + + - name: Create artifact + uses: actions/upload-artifact@v3 + with: + name: antora + path: antora/site deliverables: name: Create deliverables package runs-on: ubuntu-latest needs: [setup,antora] steps: -# - name: Checkout interface -# uses: actions/checkout@v3 -# with: -# path: dist/open-simulation-interface + - name: Checkout interface + uses: actions/checkout@v3 + with: + path: dist/open-simulation-interface - name: Checkout sensor model packaging uses: actions/checkout@v3 with: repository: OpenSimulationInterface/osi-sensor-model-packaging path: dist/osi-sensor-model-packaging + + - name: Retrieve Antora artifact + uses: actions/download-artifact@v3 + with: + name: antora - name: Create README working-directory: dist run: | - echo ${{needs.setup.outputs.VERSION}} + echo ${{ needs.setup.outputs.VERSION }} echo "/********************************************************************************** *** ASAM OSI *** *** Version : ${{ needs.setup.outputs.VERSION }} *** @@ -88,9 +98,9 @@ jobs: - name: test run: | - ls -la + ls cd dist - ls -la + ls - name: Create deliverables package uses: actions/upload-artifact@v3 From 70e2a808bce514fcc65a2593f1bb6248b76cdfab Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 21 Oct 2022 16:38:41 +0200 Subject: [PATCH 13/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 878985bb7..906d77c1d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,6 +46,9 @@ jobs: entrypoint: sh args: antora.sh + - name: Test + run: ls + - name: Create artifact uses: actions/upload-artifact@v3 with: From 822acf7abb5e625621f68dda8bd199e843135148 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 21 Oct 2022 16:40:20 +0200 Subject: [PATCH 14/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 906d77c1d..3a9187db7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,7 +47,9 @@ jobs: args: antora.sh - name: Test - run: ls + run: | + cd antora + ls - name: Create artifact uses: actions/upload-artifact@v3 From ec0813e79ec819c83706bd7ca27c53b8b0dc121f Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 21 Oct 2022 16:44:13 +0200 Subject: [PATCH 15/55] Update release.yml test with original content Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3a9187db7..b183aa831 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,7 +35,8 @@ jobs: - name: Manipulate site.yml working-directory: antora run: | - sed -i -E 's/branches: (.*) \# (open-.*|osi-.*)//g' site.yml + sed -i -E 's/doxygen: true//g' site.yml +# sed -i -E 's/branches: (.*) \# (open-.*|osi-.*)//g' site.yml - name: Create run instructions run: echo "#!/bin/bash\n\ncd antora\nexec antora --stacktrace --fetch --clean site.yml" > antora.sh From 4f16d574bc94f1e2e4d66e6284dc6529473aa8c3 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 21 Oct 2022 16:48:38 +0200 Subject: [PATCH 16/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b183aa831..5156357c5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,9 +35,12 @@ jobs: - name: Manipulate site.yml working-directory: antora run: | + cat site.yml sed -i -E 's/doxygen: true//g' site.yml + cat site.yml # sed -i -E 's/branches: (.*) \# (open-.*|osi-.*)//g' site.yml + - name: Create run instructions run: echo "#!/bin/bash\n\ncd antora\nexec antora --stacktrace --fetch --clean site.yml" > antora.sh From bdfc5886b9cfdd829d71d003b314ed7f75914b9a Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 21 Oct 2022 16:54:02 +0200 Subject: [PATCH 17/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5156357c5..8469b57df 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,12 @@ jobs: - name: Create run instructions - run: echo "#!/bin/bash\n\ncd antora\nexec antora --stacktrace --fetch --clean site.yml" > antora.sh + run: | + echo "#!/bin/bash + + cd antora + exec antora --stacktrace --fetch --clean site.yml" > antora.sh + cat antora.sh - name: Run Antora uses: docker://ghcr.io/asam-ev/project-guide-docker:4 From e94a4b48e0cee0301e52f6c8c01253c3d8e7f7f5 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 21 Oct 2022 16:58:38 +0200 Subject: [PATCH 18/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8469b57df..e95b57970 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,6 +31,7 @@ jobs: with: repository: OpenSimulationInterface/osi-antora-generator path: antora + submodules: true - name: Manipulate site.yml working-directory: antora From 233dd56bca7cf25fce14a758e339f16bdc5137ee Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 21 Oct 2022 17:51:21 +0200 Subject: [PATCH 19/55] Update release.yml new release update job step Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e95b57970..8bf708b70 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,10 +36,7 @@ jobs: - name: Manipulate site.yml working-directory: antora run: | - cat site.yml - sed -i -E 's/doxygen: true//g' site.yml - cat site.yml -# sed -i -E 's/branches: (.*) \# (open-.*|osi-.*)//g' site.yml + sed -i -E 's/branches: (.*) \# (open-.*|osi-.*)//g' site.yml - name: Create run instructions @@ -56,11 +53,6 @@ jobs: entrypoint: sh args: antora.sh - - name: Test - run: | - cd antora - ls - - name: Create artifact uses: actions/upload-artifact@v3 with: @@ -111,12 +103,6 @@ jobs: filename: ASAM_OSI_${{ needs.setup.outputs.VERSION }}.zip path: dist - - name: test - run: | - ls - cd dist - ls - - name: Create deliverables package uses: actions/upload-artifact@v3 with: @@ -134,8 +120,7 @@ jobs: name: deliverables - name: Add deliverables to release - uses: irongut/EditRelease@v1.2.0 + uses: svenstaro/upload-release-action@v2 with: - token: ${{ secrets.GITHUB_TOKEN }} - id: ${{ github.event.release.id }} - files: "ASAM_OSI_${{ needs.setup.outputs.VERSION }}.zip" + file: ASAM_OSI_${{ needs.setup.outputs.VERSION }}.zip + tag: ${{ github.ref }} From c088af74d1aa919da869af932c55a3efa86ec2ce Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 21 Oct 2022 18:29:33 +0200 Subject: [PATCH 20/55] Update release.yml test with improved var usage Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8bf708b70..eb7a0b47d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,19 +8,19 @@ jobs: setup: name: Setup variables runs-on: ubuntu-latest + outputs: + version: ${{ steps.var_step.outputs.version }} steps: - name: Checkout interface uses: actions/checkout@v3 with: path: dist/open-simulation-interface - name: Set vars - id: vars + id: var_step working-directory: dist/open-simulation-interface run: | - VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT - echo $VERSION - outputs: - VERSION: ${{ steps.vars.outputs.VERSION }} + version=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT + echo $version antora: name: Generate Antora content @@ -80,34 +80,37 @@ jobs: with: name: antora + - run: | + echo ${{needs.setup.outputs.version}} + version=${{needs.setup.outputs.version}} + - name: Create README working-directory: dist run: | - echo ${{ needs.setup.outputs.VERSION }} echo "/********************************************************************************** *** ASAM OSI *** - *** Version : ${{ needs.setup.outputs.VERSION }} *** + *** Version : $version *** *** Date: $(cat DOCDATE) *** **********************************************************************************/ the deliverables of ASAM OSI $VERSION include: - - ASAM_OSI_Standard_${{ needs.setup.outputs.VERSION }} - - open_simulation_interface_${{ needs.setup.outputs.VERSION }} - - osi-sensor-model-packaging_${{ needs.setup.outputs.VERSION }}" > "README.txt" + - ASAM_OSI_Standard_$version + - open_simulation_interface_$version + - osi-sensor-model-packaging_$version" > "README.txt" cat README.txt - name: Zip Release uses: TheDoctor0/zip-release@0.6.2 with: - filename: ASAM_OSI_${{ needs.setup.outputs.VERSION }}.zip + filename: ASAM_OSI_$version.zip path: dist - name: Create deliverables package uses: actions/upload-artifact@v3 with: name: deliverables - path: ASAM_OSI_${{ needs.setup.outputs.VERSION }}.zip + path: ASAM_OSI_$version.zip publish: name: Add deliverables to release @@ -118,7 +121,9 @@ jobs: uses: actions/download-artifact@v3 with: name: deliverables - + + - run: version=${{needs.setup.outputs.version}} + - name: Add deliverables to release uses: svenstaro/upload-release-action@v2 with: From 1f8cbc3336ef60b8efac33711770dd1d24ce2a75 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 21 Oct 2022 18:56:06 +0200 Subject: [PATCH 21/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eb7a0b47d..df56c4b86 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,18 +9,20 @@ jobs: name: Setup variables runs-on: ubuntu-latest outputs: - version: ${{ steps.var_step.outputs.version }} + output1: ${{ steps.var_step.outputs.version }} + output2: ${{ steps.var_step.outputs.docdate }} steps: - name: Checkout interface uses: actions/checkout@v3 with: path: dist/open-simulation-interface - - name: Set vars + - name: Set version id: var_step working-directory: dist/open-simulation-interface - run: | - version=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT - echo $version + run: version=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT + - name: Set date + id: date_step + run: echo "docdate=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT antora: name: Generate Antora content @@ -80,9 +82,10 @@ jobs: with: name: antora - - run: | - echo ${{needs.setup.outputs.version}} - version=${{needs.setup.outputs.version}} + - run: echo ${{needs.setup.outputs.output1}} + - run: version=${{needs.setup.outputs.output1}} + - run: echo ${{needs.setup.outputs.output2}} + - run: docdate=${{needs.setup.outputs.output2}} - name: Create README working-directory: dist @@ -90,10 +93,10 @@ jobs: echo "/********************************************************************************** *** ASAM OSI *** *** Version : $version *** - *** Date: $(cat DOCDATE) *** + *** Date: $docdate *** **********************************************************************************/ - the deliverables of ASAM OSI $VERSION include: + The deliverables of ASAM OSI $VERSION include: - ASAM_OSI_Standard_$version - open_simulation_interface_$version @@ -127,5 +130,5 @@ jobs: - name: Add deliverables to release uses: svenstaro/upload-release-action@v2 with: - file: ASAM_OSI_${{ needs.setup.outputs.VERSION }}.zip + file: ASAM_OSI_$version.zip tag: ${{ github.ref }} From 38c0fe7301771fed99ede1950337bfab2d203c65 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 24 Oct 2022 09:10:47 +0200 Subject: [PATCH 22/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index df56c4b86..d0127dc93 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,8 +9,8 @@ jobs: name: Setup variables runs-on: ubuntu-latest outputs: - output1: ${{ steps.var_step.outputs.version }} - output2: ${{ steps.var_step.outputs.docdate }} + output1: ${{steps.var_step.outputs.version}} + output2: ${{steps.date_step.outputs.docdate}} steps: - name: Checkout interface uses: actions/checkout@v3 @@ -23,6 +23,7 @@ jobs: - name: Set date id: date_step run: echo "docdate=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT + - run: echo ${{steps.var_step.outputs.version}} ${{steps.date_step.outputs.docdate}} antora: name: Generate Antora content From 2f67d7b353a68f21c03d68df473e793cec211c98 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 24 Oct 2022 09:14:48 +0200 Subject: [PATCH 23/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d0127dc93..18e33e216 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,8 @@ jobs: - name: Set version id: var_step working-directory: dist/open-simulation-interface - run: version=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT + run: echo "version=$(git describe --tags --always | sed 's/^v//')" >> $GITHUB_OUTPUT + - name: Set date id: date_step run: echo "docdate=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT From 6fb7176453bbec78698d4fd9b374d18e6921da01 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 24 Oct 2022 09:42:26 +0200 Subject: [PATCH 24/55] Update release.yml Added comments Updated use of variables Changed use of path/directory for zip-release Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 63 +++++++++++++++++------------------ 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 18e33e216..0cac4fdc8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,132 +5,131 @@ on: types: [released] jobs: + ## Pepararation job for setting up relevant variables setup: name: Setup variables runs-on: ubuntu-latest + # Declare output variables to be usable in other jobs outputs: output1: ${{steps.var_step.outputs.version}} output2: ${{steps.date_step.outputs.docdate}} steps: + # Check out the GitHub repository - name: Checkout interface uses: actions/checkout@v3 with: path: dist/open-simulation-interface + # Set the version variable based on the latest tag (could be replaced with github-internal predefined variable?) - name: Set version id: var_step working-directory: dist/open-simulation-interface run: echo "version=$(git describe --tags --always | sed 's/^v//')" >> $GITHUB_OUTPUT - + # Set the release date (current date) - name: Set date id: date_step run: echo "docdate=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT - - run: echo ${{steps.var_step.outputs.version}} ${{steps.date_step.outputs.docdate}} - + + ## Antora job, responsible for creating the Antora output of the release antora: name: Generate Antora content runs-on: ubuntu-22.04 steps: + # Check out the Antora generator - name: Checkout Antora generator uses: actions/checkout@v3 with: repository: OpenSimulationInterface/osi-antora-generator path: antora submodules: true - + # Remove building branches for the main repositories. This will lead to Antora only using the tagged versions to build its content. - name: Manipulate site.yml working-directory: antora run: | sed -i -E 's/branches: (.*) \# (open-.*|osi-.*)//g' site.yml - - + # Create custom build instructions for GitHub compatibility - name: Create run instructions run: | - echo "#!/bin/bash - cd antora exec antora --stacktrace --fetch --clean site.yml" > antora.sh cat antora.sh - + # Run Antora to generate the document - name: Run Antora uses: docker://ghcr.io/asam-ev/project-guide-docker:4 with: entrypoint: sh args: antora.sh - - - name: Create artifact + # Upload the created artifact for later jobs to use + - name: Upload artifact uses: actions/upload-artifact@v3 with: name: antora path: antora/site + ## Step for creating the zip file with all deliverables deliverables: name: Create deliverables package runs-on: ubuntu-latest needs: [setup,antora] steps: + # Check out the repository (again) - name: Checkout interface uses: actions/checkout@v3 with: path: dist/open-simulation-interface - + # Check out the sensor model packaging repo - name: Checkout sensor model packaging uses: actions/checkout@v3 with: repository: OpenSimulationInterface/osi-sensor-model-packaging path: dist/osi-sensor-model-packaging - + # Retrieve the Antora artifact from the previous job - name: Retrieve Antora artifact uses: actions/download-artifact@v3 with: name: antora - - - run: echo ${{needs.setup.outputs.output1}} - - run: version=${{needs.setup.outputs.output1}} - - run: echo ${{needs.setup.outputs.output2}} - - run: docdate=${{needs.setup.outputs.output2}} - + # Create the mandatory README.txt file for the deliverables package - name: Create README working-directory: dist run: | echo "/********************************************************************************** *** ASAM OSI *** - *** Version : $version *** - *** Date: $docdate *** + *** Version : ${{needs.setup.outputs.output1}} *** + *** Date: ${{needs.setup.outputs.output2}} *** **********************************************************************************/ The deliverables of ASAM OSI $VERSION include: - - ASAM_OSI_Standard_$version - - open_simulation_interface_$version - - osi-sensor-model-packaging_$version" > "README.txt" + - ASAM_OSI_Standard_${{needs.setup.outputs.output1}} + - open_simulation_interface_${{needs.setup.outputs.output1}} + - osi-sensor-model-packaging_${{needs.setup.outputs.output1}}" > "README.txt" cat README.txt - + # Package all collected deliverables - name: Zip Release uses: TheDoctor0/zip-release@0.6.2 with: filename: ASAM_OSI_$version.zip - path: dist - - - name: Create deliverables package + directory: dist + # Upload the created artifact for the publish job + - name: Upload artifact uses: actions/upload-artifact@v3 with: name: deliverables path: ASAM_OSI_$version.zip + ## Publishing step, where the created zip file is uploaded to the triggering release publication publish: name: Add deliverables to release runs-on: ubuntu-latest needs: [deliverables, setup] steps: + # Retrieve the previously uploaded deliverables artifact - name: Retrieve previous artifacts uses: actions/download-artifact@v3 with: name: deliverables - - - run: version=${{needs.setup.outputs.version}} - + # Add the new zip file with the deliverables to the respective release - name: Add deliverables to release uses: svenstaro/upload-release-action@v2 with: - file: ASAM_OSI_$version.zip + file: ASAM_OSI_${{needs.setup.outputs.output1}}.zip tag: ${{ github.ref }} From bf5c78ba0566a84ee60af757bacf2c5f9d618b55 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 24 Oct 2022 09:48:49 +0200 Subject: [PATCH 25/55] Update release.yml Fixed broken antora instructions Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0cac4fdc8..ca36b566e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,6 +49,8 @@ jobs: # Create custom build instructions for GitHub compatibility - name: Create run instructions run: | + echo "#!/bin/bash + cd antora exec antora --stacktrace --fetch --clean site.yml" > antora.sh cat antora.sh From 1c68d1b0ae3476d7f9feb0b22cd2de6264f94b62 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 24 Oct 2022 10:06:18 +0200 Subject: [PATCH 26/55] Update release.yml Get artifact from dist directory Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ca36b566e..114c1f61d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -95,11 +95,11 @@ jobs: run: | echo "/********************************************************************************** *** ASAM OSI *** - *** Version : ${{needs.setup.outputs.output1}} *** - *** Date: ${{needs.setup.outputs.output2}} *** + *** Version : ${{needs.setup.outputs.output1}} *** + *** Date: ${{needs.setup.outputs.output2}} *** **********************************************************************************/ - The deliverables of ASAM OSI $VERSION include: + The deliverables of ASAM OSI $VERSION include: - ASAM_OSI_Standard_${{needs.setup.outputs.output1}} - open_simulation_interface_${{needs.setup.outputs.output1}} @@ -116,7 +116,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: deliverables - path: ASAM_OSI_$version.zip + path: dist/ASAM_OSI_$version.zip ## Publishing step, where the created zip file is uploaded to the triggering release publication publish: From 11f9c548f2179384a8f04dfe546da5aa6cfb1f8a Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 24 Oct 2022 10:19:32 +0200 Subject: [PATCH 27/55] Update release.yml Replaced outdated $version var Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 114c1f61d..80027f3a0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -109,14 +109,14 @@ jobs: - name: Zip Release uses: TheDoctor0/zip-release@0.6.2 with: - filename: ASAM_OSI_$version.zip + filename: ASAM_OSI_${{needs.setup.outputs.output1}}.zip directory: dist # Upload the created artifact for the publish job - name: Upload artifact uses: actions/upload-artifact@v3 with: name: deliverables - path: dist/ASAM_OSI_$version.zip + path: dist/ASAM_OSI_${{needs.setup.outputs.output1}}.zip ## Publishing step, where the created zip file is uploaded to the triggering release publication publish: From 1efda9be6125472519537bb979c5cfcaaefce658 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 24 Oct 2022 10:34:41 +0200 Subject: [PATCH 28/55] Update release.yml Fixed README text Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 80027f3a0..f8a2d5fe6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -94,9 +94,9 @@ jobs: working-directory: dist run: | echo "/********************************************************************************** - *** ASAM OSI *** - *** Version : ${{needs.setup.outputs.output1}} *** - *** Date: ${{needs.setup.outputs.output2}} *** + *** ASAM OSI *** + *** Version : ${{needs.setup.outputs.output1}} *** + *** Date: ${{needs.setup.outputs.output2}} *** **********************************************************************************/ The deliverables of ASAM OSI $VERSION include: From 621914638942daf716ccdaee41ccfef871f70836 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 24 Oct 2022 10:36:11 +0200 Subject: [PATCH 29/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f8a2d5fe6..95adc0648 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -99,7 +99,7 @@ jobs: *** Date: ${{needs.setup.outputs.output2}} *** **********************************************************************************/ - The deliverables of ASAM OSI $VERSION include: + The deliverables of ASAM OSI v${{needs.setup.outputs.output1}} include: - ASAM_OSI_Standard_${{needs.setup.outputs.output1}} - open_simulation_interface_${{needs.setup.outputs.output1}} From 8529d40f6dd9a333d923a453669ed4548b80217f Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 24 Oct 2022 11:33:57 +0200 Subject: [PATCH 30/55] Update release.yml Changed to published Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 95adc0648..c25ef6966 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: GitHub Release Pipeline on: release: - types: [released] + types: [published] jobs: ## Pepararation job for setting up relevant variables From cadd87eb3b636e8db9c12c593c374d9df4ad012f Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 24 Oct 2022 13:22:55 +0200 Subject: [PATCH 31/55] Update release.yml Updated with special echo functions Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c25ef6966..f8295743f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -93,17 +93,24 @@ jobs: - name: Create README working-directory: dist run: | - echo "/********************************************************************************** - *** ASAM OSI *** - *** Version : ${{needs.setup.outputs.output1}} *** - *** Date: ${{needs.setup.outputs.output2}} *** - **********************************************************************************/ - - The deliverables of ASAM OSI v${{needs.setup.outputs.output1}} include: + declare -i char_count=84 + declare -i char_count_header=$char_count-1 + repeat(){ for i in $(eval echo {1..$1}); do echo -n "$2"; done; echo ""; } + fill(){ declare -i length=$1-${#2}-9; spaces=$(repeat $length ".");echo "***" "$2" "${spaces//./ }" "***"; } + name="ASAM OSI" + version="Version: ${{needs.setup.outputs.output1}}" + date="Date: ${{needs.setup.outputs.output2}}" + + echo "/$(repeat $char_count_header "*")" > README.txt + fill $char_count "$name" >> README.txt + fill $char_count "$version" >> README.txt + fill $char_count "$date" >> README.txt + echo "$(repeat $char_count_header "*")/" >> README.txt + echo The deliverables of ASAM OSI v${{needs.setup.outputs.output1}} include: - ASAM_OSI_Standard_${{needs.setup.outputs.output1}} - open_simulation_interface_${{needs.setup.outputs.output1}} - - osi-sensor-model-packaging_${{needs.setup.outputs.output1}}" > "README.txt" + - osi-sensor-model-packaging_${{needs.setup.outputs.output1}}" >> "README.txt" cat README.txt # Package all collected deliverables - name: Zip Release From ac2372bfbaa3b672dc8e5ed494716cd5e4e1b01e Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 24 Oct 2022 13:38:34 +0200 Subject: [PATCH 32/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f8295743f..bc93ea3b6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -106,7 +106,7 @@ jobs: fill $char_count "$version" >> README.txt fill $char_count "$date" >> README.txt echo "$(repeat $char_count_header "*")/" >> README.txt - echo The deliverables of ASAM OSI v${{needs.setup.outputs.output1}} include: + echo "The deliverables of ASAM OSI v${{needs.setup.outputs.output1}} include: - ASAM_OSI_Standard_${{needs.setup.outputs.output1}} - open_simulation_interface_${{needs.setup.outputs.output1}} From e509e15b024c99cf2ec733299a3e806f9f198f25 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Tue, 25 Oct 2022 09:23:01 +0200 Subject: [PATCH 33/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bc93ea3b6..e8bd20208 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -89,7 +89,12 @@ jobs: uses: actions/download-artifact@v3 with: name: antora - # Create the mandatory README.txt file for the deliverables package + # Move downloaded Antora artifact to the correct location + - name: Move and rename Antora artifact (ASAM_OSI_Standard) + run: | + ls + mv antora/site/ dist/ASAM_OSI_Standard_${{needs.setup.outputs.output1}}/ + # Create the mandatory README.txt file for the deliverables package. The functions and variables declared below will create a readme file with a defined header, surrounded by a box made of "*". - name: Create README working-directory: dist run: | From cce49641420038718ee01ba9d598e3f9e354e7af Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Tue, 25 Oct 2022 09:40:02 +0200 Subject: [PATCH 34/55] Update release.yml download artifact into correct folder Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e8bd20208..1438be802 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -89,11 +89,12 @@ jobs: uses: actions/download-artifact@v3 with: name: antora - # Move downloaded Antora artifact to the correct location - - name: Move and rename Antora artifact (ASAM_OSI_Standard) - run: | - ls - mv antora/site/ dist/ASAM_OSI_Standard_${{needs.setup.outputs.output1}}/ + path: dist/ASAM_OSI_Standard_${{needs.setup.outputs.output1}}/ +# # Move downloaded Antora artifact to the correct location +# - name: Move and rename Antora artifact (ASAM_OSI_Standard) +# run: | +# ls +# mv antora/site/ dist/ASAM_OSI_Standard_${{needs.setup.outputs.output1}}/ # Create the mandatory README.txt file for the deliverables package. The functions and variables declared below will create a readme file with a defined header, surrounded by a box made of "*". - name: Create README working-directory: dist From 9afc3c0bd3033fdce542dc2e29d542150d8cea90 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 9 Jan 2023 14:23:00 +0100 Subject: [PATCH 35/55] Update release.yml Added tagging for documentation and osmp repo Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1438be802..fecfcb966 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,29 @@ jobs: - name: Set date id: date_step run: echo "docdate=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT - + + tagging_update: + name: Update OSMP & Documentation + runs-on: ubuntu-22.04 + needs: [setup] + steps: + - name: Update OSMP + uses: peter-evans/repository-dispatch@v2 + with: + token: ${{ secrets.MACHINE_USER_PAT }} + event-type: update-tag +# repository: OpenSimulationInterface/osi-sensor-model-packaging + repository: philipwindecker/osi-sensor-model-packaging + client-payload: '{"tag": "${{needs.setup.outputs.output1}}-antora"}' + - name: Update Documentation + uses: peter-evans/repository-dispatch@v2 + with: + token: ${{ secrets.MACHINE_USER_PAT }} + event-type: update-tag +# repository: OpenSimulationInterface/osi-documentation + repository: philipwindecker/osi-documentation + client-payload: '{"tag": "${{needs.setup.outputs.output1}}-antora"}' + ## Antora job, responsible for creating the Antora output of the release antora: name: Generate Antora content @@ -38,7 +60,8 @@ jobs: - name: Checkout Antora generator uses: actions/checkout@v3 with: - repository: OpenSimulationInterface/osi-antora-generator +# repository: OpenSimulationInterface/osi-antora-generator + repository: philipwindecker/osi-antora-generator path: antora submodules: true # Remove building branches for the main repositories. This will lead to Antora only using the tagged versions to build its content. @@ -50,7 +73,6 @@ jobs: - name: Create run instructions run: | echo "#!/bin/bash - cd antora exec antora --stacktrace --fetch --clean site.yml" > antora.sh cat antora.sh @@ -82,7 +104,8 @@ jobs: - name: Checkout sensor model packaging uses: actions/checkout@v3 with: - repository: OpenSimulationInterface/osi-sensor-model-packaging +# repository: OpenSimulationInterface/osi-sensor-model-packaging + repository: philipwindecker/osi-sensor-model-packaging path: dist/osi-sensor-model-packaging # Retrieve the Antora artifact from the previous job - name: Retrieve Antora artifact From 7d79e662b72c79f2db41ec4834edbd5cac51cd20 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 9 Jan 2023 15:13:11 +0100 Subject: [PATCH 36/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fecfcb966..5e9d5ae88 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -55,6 +55,7 @@ jobs: antora: name: Generate Antora content runs-on: ubuntu-22.04 + needs: [tagging_update] steps: # Check out the Antora generator - name: Checkout Antora generator From 877cd0162455ac5eef530bd34ec4f6efefb55fac Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 9 Jan 2023 16:34:51 +0100 Subject: [PATCH 37/55] Update release.yml Removed "-antora" from tag for osi-documentation. Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5e9d5ae88..93a63c090 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,7 +49,7 @@ jobs: event-type: update-tag # repository: OpenSimulationInterface/osi-documentation repository: philipwindecker/osi-documentation - client-payload: '{"tag": "${{needs.setup.outputs.output1}}-antora"}' + client-payload: '{"tag": "${{needs.setup.outputs.output1}}"}' ## Antora job, responsible for creating the Antora output of the release antora: From 934c33c5013dc8d3ce71b185e4ee8625c9ca7a9b Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 9 Jan 2023 16:40:10 +0100 Subject: [PATCH 38/55] Update release.yml Add 1m delay before continuing the release action Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 93a63c090..0d4a58100 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,6 +29,7 @@ jobs: id: date_step run: echo "docdate=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT + ## Tag and update related repositories before checking them out for Antora and the deliverables tagging_update: name: Update OSMP & Documentation runs-on: ubuntu-22.04 @@ -50,6 +51,11 @@ jobs: # repository: OpenSimulationInterface/osi-documentation repository: philipwindecker/osi-documentation client-payload: '{"tag": "${{needs.setup.outputs.output1}}"}' + - name: Provide downstream repos some time + uses: whatnick/wait-action@v0.1.2 + with: + time: '1m' + ## Antora job, responsible for creating the Antora output of the release antora: From a222c47782661bf504e192fc828a68bd9ad2b236 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Tue, 10 Jan 2023 14:13:54 +0100 Subject: [PATCH 39/55] Update release.yml Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0d4a58100..7bb35125b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,7 @@ jobs: event-type: update-tag # repository: OpenSimulationInterface/osi-sensor-model-packaging repository: philipwindecker/osi-sensor-model-packaging - client-payload: '{"tag": "${{needs.setup.outputs.output1}}-antora"}' + client-payload: '{"tag": "v${{needs.setup.outputs.output1}}-antora"}' - name: Update Documentation uses: peter-evans/repository-dispatch@v2 with: @@ -50,7 +50,7 @@ jobs: event-type: update-tag # repository: OpenSimulationInterface/osi-documentation repository: philipwindecker/osi-documentation - client-payload: '{"tag": "${{needs.setup.outputs.output1}}"}' + client-payload: '{"tag": "v${{needs.setup.outputs.output1}}"}' - name: Provide downstream repos some time uses: whatnick/wait-action@v0.1.2 with: @@ -76,6 +76,7 @@ jobs: working-directory: antora run: | sed -i -E 's/branches: (.*) \# (open-.*|osi-.*)//g' site.yml + cat site.yml # Create custom build instructions for GitHub compatibility - name: Create run instructions run: | From 0ece28a4d36312a9529c4bac404780a56650d221 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Tue, 10 Jan 2023 17:30:55 +0100 Subject: [PATCH 40/55] Update release.yml Debug site.yml changes Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7bb35125b..a3032f0d6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,6 +82,7 @@ jobs: run: | echo "#!/bin/bash cd antora + cat site.yml exec antora --stacktrace --fetch --clean site.yml" > antora.sh cat antora.sh # Run Antora to generate the document From 4c184923d2ffdf6057cdbd375bb031a92eebbae5 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 13 Jan 2023 11:45:05 +0100 Subject: [PATCH 41/55] Update release.yml Changed version tag for OSMP from interface tag to osmp tag Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a3032f0d6..aeae5cd7f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -128,6 +128,10 @@ jobs: # ls # mv antora/site/ dist/ASAM_OSI_Standard_${{needs.setup.outputs.output1}}/ # Create the mandatory README.txt file for the deliverables package. The functions and variables declared below will create a readme file with a defined header, surrounded by a box made of "*". + - name: Get OSMP version + working-directoy: dist/osi-sensor-model-packaging + run: | + OSMP_VERSION="$(git describe --tags --exclude 'v*.*.*-antora' | sed 's/^v//')" - name: Create README working-directory: dist run: | @@ -148,7 +152,7 @@ jobs: - ASAM_OSI_Standard_${{needs.setup.outputs.output1}} - open_simulation_interface_${{needs.setup.outputs.output1}} - - osi-sensor-model-packaging_${{needs.setup.outputs.output1}}" >> "README.txt" + - osi-sensor-model-packaging_${OSMP_VERSION}" >> "README.txt" cat README.txt # Package all collected deliverables - name: Zip Release From 477d94e14bccbb84891a90a15caeb5fce78377b0 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 13 Jan 2023 12:29:05 +0100 Subject: [PATCH 42/55] Update release.yml Added suffix to repo dispatch notice Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aeae5cd7f..7576ec5ef 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,6 +13,7 @@ jobs: outputs: output1: ${{steps.var_step.outputs.version}} output2: ${{steps.date_step.outputs.docdate}} + output3: ${{steps.var_step.outputs.suffix}} steps: # Check out the GitHub repository - name: Checkout interface @@ -23,7 +24,9 @@ jobs: - name: Set version id: var_step working-directory: dist/open-simulation-interface - run: echo "version=$(git describe --tags --always | sed 's/^v//')" >> $GITHUB_OUTPUT + run: | + echo "version=$(git describe --tags --always | sed 's/^v//')" >> $GITHUB_OUTPUT + echo "suffix=$(echo ${version} | sed -r 's/[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+//')" >> $GITHUB_OUTPUT # Set the release date (current date) - name: Set date id: date_step @@ -42,7 +45,7 @@ jobs: event-type: update-tag # repository: OpenSimulationInterface/osi-sensor-model-packaging repository: philipwindecker/osi-sensor-model-packaging - client-payload: '{"tag": "v${{needs.setup.outputs.output1}}-antora"}' + client-payload: '{"tag": "v${{needs.setup.outputs.output1}}-antora", "suffix": "${{needs.setup.outputs.output3}}"}' - name: Update Documentation uses: peter-evans/repository-dispatch@v2 with: From 0998897e2149843ff1fc72518f4f26f9b5bb5a37 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 13 Jan 2023 12:32:30 +0100 Subject: [PATCH 43/55] Update release.yml Fixed typo Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7576ec5ef..76eb44e7e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -132,7 +132,7 @@ jobs: # mv antora/site/ dist/ASAM_OSI_Standard_${{needs.setup.outputs.output1}}/ # Create the mandatory README.txt file for the deliverables package. The functions and variables declared below will create a readme file with a defined header, surrounded by a box made of "*". - name: Get OSMP version - working-directoy: dist/osi-sensor-model-packaging + working-directory: dist/osi-sensor-model-packaging run: | OSMP_VERSION="$(git describe --tags --exclude 'v*.*.*-antora' | sed 's/^v//')" - name: Create README From bac426b720cd5393587ed3dba2d2211009ee20d3 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 13 Jan 2023 14:41:18 +0100 Subject: [PATCH 44/55] Update release.yml Allocated more memory for JS due to large content size with multiple versions Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 76eb44e7e..de056078b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -88,6 +88,9 @@ jobs: cat site.yml exec antora --stacktrace --fetch --clean site.yml" > antora.sh cat antora.sh + # Allocate more memory for large data sets! + - name: Allocate more memory for JavaScript + run: export NODE_OPTIONS="--max-old-space-size=8192" # Run Antora to generate the document - name: Run Antora uses: docker://ghcr.io/asam-ev/project-guide-docker:4 From f354c41808f76f659350baa3085d5f646b30690b Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 13 Jan 2023 17:00:52 +0100 Subject: [PATCH 45/55] Update release.yml Made suffix explicitly defined Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index de056078b..a3cfa0938 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: working-directory: dist/open-simulation-interface run: | echo "version=$(git describe --tags --always | sed 's/^v//')" >> $GITHUB_OUTPUT - echo "suffix=$(echo ${version} | sed -r 's/[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+//')" >> $GITHUB_OUTPUT + echo "suffix=$(git describe --tags --always | sed -r 's/^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+//')" >> $GITHUB_OUTPUT # Set the release date (current date) - name: Set date id: date_step From b5ad78bab3758486638da09d2d768accdc5ccedb Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 13 Jan 2023 17:28:11 +0100 Subject: [PATCH 46/55] Update release.yml Moved NODE_OPTIONS to image instructions Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a3cfa0938..9bc447562 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -86,11 +86,9 @@ jobs: echo "#!/bin/bash cd antora cat site.yml + export NODE_OPTIONS="--max-old-space-size=8192" exec antora --stacktrace --fetch --clean site.yml" > antora.sh cat antora.sh - # Allocate more memory for large data sets! - - name: Allocate more memory for JavaScript - run: export NODE_OPTIONS="--max-old-space-size=8192" # Run Antora to generate the document - name: Run Antora uses: docker://ghcr.io/asam-ev/project-guide-docker:4 From 481d85c0ace80c5a386f21c142eb1978a0c27e60 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 13 Jan 2023 18:07:40 +0100 Subject: [PATCH 47/55] Update release.yml Removed -antora for OSMP to manage this in OSMP directly Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9bc447562..ae8241eee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,7 +45,7 @@ jobs: event-type: update-tag # repository: OpenSimulationInterface/osi-sensor-model-packaging repository: philipwindecker/osi-sensor-model-packaging - client-payload: '{"tag": "v${{needs.setup.outputs.output1}}-antora", "suffix": "${{needs.setup.outputs.output3}}"}' + client-payload: '{"tag": "v${{needs.setup.outputs.output1}}", "suffix": "${{needs.setup.outputs.output3}}"}' - name: Update Documentation uses: peter-evans/repository-dispatch@v2 with: From d1120e8cf3f7546c0f66a0fc5dc30625d2848978 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 13 Jan 2023 18:10:20 +0100 Subject: [PATCH 48/55] Update release.yml explicitly send repo to prevent manual changes when testing with forks Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ae8241eee..d552410ae 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,7 +45,7 @@ jobs: event-type: update-tag # repository: OpenSimulationInterface/osi-sensor-model-packaging repository: philipwindecker/osi-sensor-model-packaging - client-payload: '{"tag": "v${{needs.setup.outputs.output1}}", "suffix": "${{needs.setup.outputs.output3}}"}' + client-payload: '{"tag": "v${{needs.setup.outputs.output1}}", "suffix": "${{needs.setup.outputs.output3}}", "source_repo": "${{ github.repository }}"}' - name: Update Documentation uses: peter-evans/repository-dispatch@v2 with: From 7331534f1ac93c1c359dfa800f9528c08a4d8377 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 13 Jan 2023 18:23:45 +0100 Subject: [PATCH 49/55] Update release.yml debug output Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d552410ae..3ac89a9ea 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -135,6 +135,7 @@ jobs: - name: Get OSMP version working-directory: dist/osi-sensor-model-packaging run: | + ls OSMP_VERSION="$(git describe --tags --exclude 'v*.*.*-antora' | sed 's/^v//')" - name: Create README working-directory: dist From 940ac3fa907d6f99853e924cdb76398996f09a95 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Fri, 13 Jan 2023 19:13:15 +0100 Subject: [PATCH 50/55] Update release.yml Added fetch-depth 0 to OSMP for version creation Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3ac89a9ea..34ae2c739 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -120,6 +120,7 @@ jobs: # repository: OpenSimulationInterface/osi-sensor-model-packaging repository: philipwindecker/osi-sensor-model-packaging path: dist/osi-sensor-model-packaging + fetch-depth: 0 # Retrieve the Antora artifact from the previous job - name: Retrieve Antora artifact uses: actions/download-artifact@v3 From a5597e2017f933eaadd8480ec346b6a31e47e6bd Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 16 Jan 2023 10:27:57 +0100 Subject: [PATCH 51/55] Update release.yml Persist variable for next step Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 34ae2c739..33cf4ea75 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -138,6 +138,7 @@ jobs: run: | ls OSMP_VERSION="$(git describe --tags --exclude 'v*.*.*-antora' | sed 's/^v//')" + echo "::set-env name=OSMP_VERSION::$OSMP_VERSION" - name: Create README working-directory: dist run: | From 5015db95aa6fd8d9e4432550c708552ebd93a99c Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 16 Jan 2023 10:55:59 +0100 Subject: [PATCH 52/55] Update release.yml Changed to environment Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 33cf4ea75..6bfb6c566 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -138,7 +138,7 @@ jobs: run: | ls OSMP_VERSION="$(git describe --tags --exclude 'v*.*.*-antora' | sed 's/^v//')" - echo "::set-env name=OSMP_VERSION::$OSMP_VERSION" + echo "OSMP_VERSION=$OSMP_VERSION" >> $GITHUB_ENV - name: Create README working-directory: dist run: | @@ -159,7 +159,7 @@ jobs: - ASAM_OSI_Standard_${{needs.setup.outputs.output1}} - open_simulation_interface_${{needs.setup.outputs.output1}} - - osi-sensor-model-packaging_${OSMP_VERSION}" >> "README.txt" + - osi-sensor-model-packaging_${{ env.OSMP_VERSION }}" >> "README.txt" cat README.txt # Package all collected deliverables - name: Zip Release From d70ded9924f982af83d8810947aee1e2c88a8670 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 16 Jan 2023 12:47:21 +0100 Subject: [PATCH 53/55] Update release.yml Added new exception for x-antora tags Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6bfb6c566..93f6a73d1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -136,8 +136,7 @@ jobs: - name: Get OSMP version working-directory: dist/osi-sensor-model-packaging run: | - ls - OSMP_VERSION="$(git describe --tags --exclude 'v*.*.*-antora' | sed 's/^v//')" + OSMP_VERSION="$(git describe --tags --exclude 'v*.*.*-antora' --exclude 'x-antora-v*.*.*'| sed 's/^v//')" echo "OSMP_VERSION=$OSMP_VERSION" >> $GITHUB_ENV - name: Create README working-directory: dist From a6ad70e5d329f5e5e6c2618f93780c97c5c94e2d Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Thu, 2 Mar 2023 17:33:53 +0100 Subject: [PATCH 54/55] Update release.yml Removed default behavior for branches Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 93f6a73d1..95c75d272 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -78,7 +78,7 @@ jobs: - name: Manipulate site.yml working-directory: antora run: | - sed -i -E 's/branches: (.*) \# (open-.*|osi-.*)//g' site.yml + sed -i -E 's/branches: (.*) \# (open-.*|osi-.*)/branches: ~/g' site.yml cat site.yml # Create custom build instructions for GitHub compatibility - name: Create run instructions From 1e9ef798cea5c8a5b702291b57076bff573b34a6 Mon Sep 17 00:00:00 2001 From: Philip Windecker Date: Mon, 27 Mar 2023 12:14:33 +0200 Subject: [PATCH 55/55] Reverted to original namespace Signed-off-by: Philip Windecker --- .github/workflows/release.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 95c75d272..bcd14f5b1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,16 +43,14 @@ jobs: with: token: ${{ secrets.MACHINE_USER_PAT }} event-type: update-tag -# repository: OpenSimulationInterface/osi-sensor-model-packaging - repository: philipwindecker/osi-sensor-model-packaging + repository: OpenSimulationInterface/osi-sensor-model-packaging client-payload: '{"tag": "v${{needs.setup.outputs.output1}}", "suffix": "${{needs.setup.outputs.output3}}", "source_repo": "${{ github.repository }}"}' - name: Update Documentation uses: peter-evans/repository-dispatch@v2 with: token: ${{ secrets.MACHINE_USER_PAT }} event-type: update-tag -# repository: OpenSimulationInterface/osi-documentation - repository: philipwindecker/osi-documentation + repository: OpenSimulationInterface/osi-documentation client-payload: '{"tag": "v${{needs.setup.outputs.output1}}"}' - name: Provide downstream repos some time uses: whatnick/wait-action@v0.1.2 @@ -70,8 +68,7 @@ jobs: - name: Checkout Antora generator uses: actions/checkout@v3 with: -# repository: OpenSimulationInterface/osi-antora-generator - repository: philipwindecker/osi-antora-generator + repository: OpenSimulationInterface/osi-antora-generator path: antora submodules: true # Remove building branches for the main repositories. This will lead to Antora only using the tagged versions to build its content. @@ -117,8 +114,7 @@ jobs: - name: Checkout sensor model packaging uses: actions/checkout@v3 with: -# repository: OpenSimulationInterface/osi-sensor-model-packaging - repository: philipwindecker/osi-sensor-model-packaging + repository: OpenSimulationInterface/osi-sensor-model-packaging path: dist/osi-sensor-model-packaging fetch-depth: 0 # Retrieve the Antora artifact from the previous job