From f66b5b4773edf3b60f296037d5d02db0fda4fd60 Mon Sep 17 00:00:00 2001 From: Levente Bajczi Date: Thu, 15 Feb 2024 19:04:38 +0100 Subject: [PATCH 1/6] Deploy doc only on master, test always --- .github/actions/deploy-docs/action.yml | 1 + .github/workflows/linux-build-test-deploy.yml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/deploy-docs/action.yml b/.github/actions/deploy-docs/action.yml index bdebe50fd0..595ad77fc9 100644 --- a/.github/actions/deploy-docs/action.yml +++ b/.github/actions/deploy-docs/action.yml @@ -17,6 +17,7 @@ runs: shell: bash working-directory: doc/wiki - uses: JamesIves/github-pages-deploy-action@22a6ee251d6f13c6ab1ecb200d974f1a6feb1b8d # v4.4.2 + if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' with: branch: gh-pages folder: doc/wiki/wiki diff --git a/.github/workflows/linux-build-test-deploy.yml b/.github/workflows/linux-build-test-deploy.yml index 06b029cf79..ad15293efc 100644 --- a/.github/workflows/linux-build-test-deploy.yml +++ b/.github/workflows/linux-build-test-deploy.yml @@ -233,7 +233,6 @@ jobs: deploy-docs: runs-on: ubuntu-latest - if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' steps: - name: Checkout repository uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 From c60e6817c944fbe204afc2dfeac4ce810003cb21 Mon Sep 17 00:00:00 2001 From: Levente Bajczi Date: Thu, 15 Feb 2024 19:07:57 +0100 Subject: [PATCH 2/6] Updated mkdocs plugins --- .github/actions/deploy-docs/action.yml | 2 ++ doc/wiki/mkdocs.yml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/actions/deploy-docs/action.yml b/.github/actions/deploy-docs/action.yml index 595ad77fc9..05e05d587c 100644 --- a/.github/actions/deploy-docs/action.yml +++ b/.github/actions/deploy-docs/action.yml @@ -13,6 +13,8 @@ runs: shell: bash - run: pip install mkdocs==1.3.0 shell: bash + - run: pip install mkdocs-awesome-pages-plugin==2.9.2 + shell: bash - run: mkdocs build --site-dir wiki shell: bash working-directory: doc/wiki diff --git a/doc/wiki/mkdocs.yml b/doc/wiki/mkdocs.yml index 6fd0b2d7f5..7fa6389340 100644 --- a/doc/wiki/mkdocs.yml +++ b/doc/wiki/mkdocs.yml @@ -13,8 +13,8 @@ markdown_extensions: - footnotes - attr_list - pymdownx.emoji: - emoji_index: !!python/name:materialx.emoji.twemoji - emoji_generator: !!python/name:materialx.emoji.to_svg + emoji_index: !!python/name:material.extensions.emoji.twemoji + emoji_generator: !!python/name:material.extensions.emoji.to_svg - abbr - pymdownx.snippets: auto_append: From e825343acec219b1f6d5694c109455401f4e0110 Mon Sep 17 00:00:00 2001 From: Levente Bajczi Date: Thu, 15 Feb 2024 19:09:51 +0100 Subject: [PATCH 3/6] Updated mkdocs plugins #2 --- .github/actions/deploy-docs/action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/deploy-docs/action.yml b/.github/actions/deploy-docs/action.yml index 05e05d587c..107835497e 100644 --- a/.github/actions/deploy-docs/action.yml +++ b/.github/actions/deploy-docs/action.yml @@ -9,6 +9,8 @@ runs: python-version: 3.x - run: pip install mkdocs-material==8.3.9 shell: bash + - run: pip install mkdocs-material-extensions==1.3.1 + shell: bash - run: pip install python-markdown-math==0.8 shell: bash - run: pip install mkdocs==1.3.0 From 273ee0241b8b911638577a546e6be3c389b7aa2c Mon Sep 17 00:00:00 2001 From: Levente Bajczi Date: Thu, 15 Feb 2024 19:12:28 +0100 Subject: [PATCH 4/6] Updated mkdocs plugins #3 --- .github/actions/deploy-docs/action.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/actions/deploy-docs/action.yml b/.github/actions/deploy-docs/action.yml index 107835497e..332510d110 100644 --- a/.github/actions/deploy-docs/action.yml +++ b/.github/actions/deploy-docs/action.yml @@ -7,9 +7,7 @@ runs: - uses: actions/setup-python@e9aba2c848f5ebd159c070c61ea2c4e2b122355e with: python-version: 3.x - - run: pip install mkdocs-material==8.3.9 - shell: bash - - run: pip install mkdocs-material-extensions==1.3.1 + - run: pip install mkdocs-material==9.5.9 shell: bash - run: pip install python-markdown-math==0.8 shell: bash From 501d826844cf01faa7e75ee67cdd4256cb5461f9 Mon Sep 17 00:00:00 2001 From: Levente Bajczi Date: Thu, 15 Feb 2024 19:13:58 +0100 Subject: [PATCH 5/6] Updated mkdocs plugins #4 --- .github/actions/deploy-docs/action.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/deploy-docs/action.yml b/.github/actions/deploy-docs/action.yml index 332510d110..cd8eddc395 100644 --- a/.github/actions/deploy-docs/action.yml +++ b/.github/actions/deploy-docs/action.yml @@ -7,13 +7,13 @@ runs: - uses: actions/setup-python@e9aba2c848f5ebd159c070c61ea2c4e2b122355e with: python-version: 3.x - - run: pip install mkdocs-material==9.5.9 + - run: pip install mkdocs-material shell: bash - - run: pip install python-markdown-math==0.8 + - run: pip install python-markdown-math shell: bash - - run: pip install mkdocs==1.3.0 + - run: pip install mkdocs shell: bash - - run: pip install mkdocs-awesome-pages-plugin==2.9.2 + - run: pip install mkdocs-awesome-pages-plugin shell: bash - run: mkdocs build --site-dir wiki shell: bash From ae0daf850c35b4e61c3ef4969421318f560291b3 Mon Sep 17 00:00:00 2001 From: "ThetaBotMaintainer[bot]" <139346997+ThetaBotMaintainer[bot]@users.noreply.github.com> Date: Thu, 15 Feb 2024 18:17:08 +0000 Subject: [PATCH 6/6] Version bump --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index e934dbaf02..9287d1aed4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -28,7 +28,7 @@ buildscript { allprojects { group = "hu.bme.mit.theta" - version = "5.0.0" + version = "5.0.1" apply(from = rootDir.resolve("gradle/shared-with-buildSrc/mirrors.gradle.kts")) }