From 6ebe135c3d7a2bf6003c515dc9a08b42fa318913 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 9 Jan 2023 15:00:38 +0100 Subject: [PATCH 1/9] Create remote_release.yml --- .github/workflows/remote_release.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/remote_release.yml diff --git a/.github/workflows/remote_release.yml b/.github/workflows/remote_release.yml new file mode 100644 index 00000000..334be9a9 --- /dev/null +++ b/.github/workflows/remote_release.yml @@ -0,0 +1,25 @@ +name: Remote Tagging + +on: + repository_dispatch: + types: [update-tag] + +jobs: + submodule: + name: Update submodule and create tag + runs-on: Ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + path: repo + fetch-depth: 0 # test if depth in fetch history is required + - name: Update submodule and push with tag + run: | + git submodule update --recursive --remote + git add . + git commit -m "git submodule updated" + git tag ${{ github.event.client_payload.tag }} + git push --atomic origin master ${{ github.event.client_payload.tag }} + + From c5ca091522e337edbcc676f5ea07c880da6230a7 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 9 Jan 2023 15:01:38 +0100 Subject: [PATCH 2/9] Update remote_release.yml --- .github/workflows/remote_release.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/remote_release.yml b/.github/workflows/remote_release.yml index 334be9a9..d0d39b87 100644 --- a/.github/workflows/remote_release.yml +++ b/.github/workflows/remote_release.yml @@ -6,7 +6,7 @@ on: jobs: submodule: - name: Update submodule and create tag + name: Create tag runs-on: Ubuntu-latest steps: - name: Checkout @@ -14,12 +14,8 @@ jobs: with: path: repo fetch-depth: 0 # test if depth in fetch history is required - - name: Update submodule and push with tag + - name: Update with tag run: | - git submodule update --recursive --remote - git add . - git commit -m "git submodule updated" git tag ${{ github.event.client_payload.tag }} git push --atomic origin master ${{ github.event.client_payload.tag }} - - + From 2d43f5dda83fc5f08551dccb67aa7fe6f9513cae Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 9 Jan 2023 15:33:36 +0100 Subject: [PATCH 3/9] Update remote_release.yml --- .github/workflows/remote_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/remote_release.yml b/.github/workflows/remote_release.yml index d0d39b87..63a84021 100644 --- a/.github/workflows/remote_release.yml +++ b/.github/workflows/remote_release.yml @@ -13,9 +13,9 @@ jobs: uses: actions/checkout@v3 with: path: repo - fetch-depth: 0 # test if depth in fetch history is required - name: Update with tag run: | + cd repo git tag ${{ github.event.client_payload.tag }} git push --atomic origin master ${{ github.event.client_payload.tag }} From b16b6b7d494cabd70437612e79c0bff23b6df98e Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 9 Jan 2023 16:01:03 +0100 Subject: [PATCH 4/9] Update remote_release.yml --- .github/workflows/remote_release.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/remote_release.yml b/.github/workflows/remote_release.yml index 63a84021..09f6adcf 100644 --- a/.github/workflows/remote_release.yml +++ b/.github/workflows/remote_release.yml @@ -6,16 +6,24 @@ on: jobs: submodule: - name: Create tag + name: Update submodule and create tag runs-on: Ubuntu-latest steps: - name: Checkout uses: actions/checkout@v3 with: - path: repo - - name: Update with tag + fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. + + - name: Update submodule and push with tag run: | - cd repo + git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" + git config --local user.name "github-actions[bot]" git tag ${{ github.event.client_payload.tag }} - git push --atomic origin master ${{ github.event.client_payload.tag }} - + + - name: GitHub Push + uses: ad-m/github-push-action@v0.6.0 + with: + # Token for the repo. Can be passed in using $\{{ secrets.GITHUB_TOKEN }} + github_token: ${{ secrets.MACHINE_USER_PAT }} + # Determines if --tags is used + tags: true From 6bae8010620c4a665fefb34ce0009213f089c63b Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 9 Jan 2023 16:26:05 +0100 Subject: [PATCH 5/9] Update remote_release.yml --- .github/workflows/remote_release.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/remote_release.yml b/.github/workflows/remote_release.yml index 09f6adcf..a6e308e2 100644 --- a/.github/workflows/remote_release.yml +++ b/.github/workflows/remote_release.yml @@ -3,6 +3,10 @@ name: Remote Tagging on: repository_dispatch: types: [update-tag] + +permissions: + contents: write + repository-projects: write jobs: submodule: @@ -14,12 +18,9 @@ jobs: with: fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - - name: Update submodule and push with tag - run: | - git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" - git config --local user.name "github-actions[bot]" - git tag ${{ github.event.client_payload.tag }} - + - name: Create tag + run: git tag ${{ github.event.client_payload.tag }} + - name: GitHub Push uses: ad-m/github-push-action@v0.6.0 with: From 18ab54d34a0640df36dd0ba4bd96efe43baa0922 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Tue, 10 Jan 2023 17:37:13 +0100 Subject: [PATCH 6/9] Update antora.yml --- .antora/antora.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.antora/antora.yml b/.antora/antora.yml index 885e9616..c6d70b0a 100644 --- a/.antora/antora.yml +++ b/.antora/antora.yml @@ -41,7 +41,8 @@ asciidoc: # Sets global AsciiDoc attributes that are applied for every page of t # doxygen_document_date: "01.01.2000" # The date associated with the document (optional) doxygen_module: "gen" # The module in which the output is stored # doxygen_module_path: "gen" # Path within module - doxygen_source_repo: "https://github.com/OpenSimulationInterface/open-simulation-interface.git" + # doxygen_source_repo: "https://github.com/OpenSimulationInterface/open-simulation-interface.git" + doxygen_source_repo: "https://github.com/philipwindecker/open-simulation-interface.git" # doxygen_source_folder: open-simulation-interface nav: @@ -54,4 +55,4 @@ nav: # Add more items here as required. # Recommended: One navigation file per document/repository! # Recommended: Name your module (folder) as your document type, e.g. "standard" or "concept" or "topic-guidelines" -# Format: - modules//.adoc \ No newline at end of file +# Format: - modules//.adoc From 50ee3d13ad667882823221256d3f51a3ce6aca29 Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 16 Jan 2023 12:40:45 +0100 Subject: [PATCH 7/9] Update antora.yml --- .antora/antora.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.antora/antora.yml b/.antora/antora.yml index c6d70b0a..ded6c2d3 100644 --- a/.antora/antora.yml +++ b/.antora/antora.yml @@ -7,6 +7,7 @@ version: main: 'current' master: 'current' v(*)-antora: V$1 + x-antora-v(*): V$1 v(*): V$1 V(*): V$1 # Update version number accordingly. This is the version for any other activated branch (branch must be added in the generator site.yml!). Schema = 0.0.x- (only works for branches starting with "feature/") From d81b53a021c1189a1115358998ea2911ca45a168 Mon Sep 17 00:00:00 2001 From: Philip Windecker Date: Mon, 27 Mar 2023 12:14:54 +0200 Subject: [PATCH 8/9] Reverted to original namespace Signed-off-by: Philip Windecker --- .antora/antora.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.antora/antora.yml b/.antora/antora.yml index 9019cf99..061c88ae 100644 --- a/.antora/antora.yml +++ b/.antora/antora.yml @@ -43,8 +43,7 @@ asciidoc: # Sets global AsciiDoc attributes that are applied for every page of t # doxygen_document_date: "01.01.2000" # The date associated with the document (optional) doxygen_module: "gen" # The module in which the output is stored # doxygen_module_path: "gen" # Path within module - # doxygen_source_repo: "https://github.com/OpenSimulationInterface/open-simulation-interface.git" - doxygen_source_repo: "https://github.com/philipwindecker/open-simulation-interface.git" + doxygen_source_repo: "https://github.com/OpenSimulationInterface/open-simulation-interface.git" # doxygen_source_folder: open-simulation-interface nav: From af864377e653f804caf932788178315ee9e91eba Mon Sep 17 00:00:00 2001 From: Philip Windecker <95633467+philipwindecker@users.noreply.github.com> Date: Mon, 27 Mar 2023 13:15:55 +0200 Subject: [PATCH 9/9] Update antora-build.yml --- .github/workflows/antora-build.yml | 46 ------------------------------ 1 file changed, 46 deletions(-) diff --git a/.github/workflows/antora-build.yml b/.github/workflows/antora-build.yml index 5961f44a..49243ec9 100644 --- a/.github/workflows/antora-build.yml +++ b/.github/workflows/antora-build.yml @@ -24,50 +24,4 @@ jobs: 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 }}"}' - # antora-build: - # name: Build - # runs-on: ubuntu-20.04 - - # services: - # kroki: - # image: yuzutech/kroki:0.15.1 - # env: - # KROKI_MAX_URI_LENGTH: 8000 - # KROKI_BLOCKDIAG_HOST: blockdiag - # KROKI_MERMAID_HOST: mermaid - # blockdiag: - # image: yuzutech/kroki-blockdiag:0.15.1 - # mermaid: - # image: yuzutech/kroki-mermaid:0.15.1 - - # steps: - # - name: Checkout generator - # uses: actions/checkout@master - # with: - # repository: OpenSimulationInterface/osi-antora-generator - # path: generator - # submodules: true - # fetch-depth: 0 - - # - name: Modify site.yml - # working-directory: generator - # run: | - # echo "$GITHUB_REF_NAME" - # sed -i -E "s%(branches\:) \[antora\/base-antora-setup\] \# osi-documentation%\1 [$GITHUB_REF_NAME] \# osi-documentation%" site.yml - # cat site.yml - # sed -i -E "s/cd repo/cd generator/" run-build.sh - # cat run-build.sh - # - name: Generate site - # uses: docker://ghcr.io/asam-ev/project-guide-docker:4 - # with: - # entrypoint: sh - # args: generator/run-build.sh - - # - name: Upload artifact - # uses: actions/upload-artifact@v3 - # with: - # name: antora-build - # path: ./generator/site - -