From 88a08e1063779fe8a098d52eb8752f2e23d474be Mon Sep 17 00:00:00 2001 From: Palash Tyagi <23239946+Magnus167@users.noreply.github.com> Date: Mon, 5 May 2025 02:24:48 +0100 Subject: [PATCH 1/4] Update push trigger branches in docs-and-testcov workflow --- .github/workflows/docs-and-testcov.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs-and-testcov.yml b/.github/workflows/docs-and-testcov.yml index 4f81af7..819f278 100644 --- a/.github/workflows/docs-and-testcov.yml +++ b/.github/workflows/docs-and-testcov.yml @@ -6,7 +6,7 @@ concurrency: on: push: - branches: [main] + branches: [main, fix_docs] # pull_request: # branches: [main] workflow_dispatch: From 9ab3a7c2c1dce2f9dfb7984a3d4fd9b340b6a170 Mon Sep 17 00:00:00 2001 From: Palash Tyagi <23239946+Magnus167@users.noreply.github.com> Date: Mon, 5 May 2025 02:39:19 +0100 Subject: [PATCH 2/4] Update branch trigger and fix documentation file handling in workflow --- .github/workflows/docs-and-testcov.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docs-and-testcov.yml b/.github/workflows/docs-and-testcov.yml index 819f278..00fa53f 100644 --- a/.github/workflows/docs-and-testcov.yml +++ b/.github/workflows/docs-and-testcov.yml @@ -6,7 +6,7 @@ concurrency: on: push: - branches: [main, fix_docs] + branches: [main, update_docs_workflow] # pull_request: # branches: [main] workflow_dispatch: @@ -96,15 +96,15 @@ jobs: run: | # mkdir docs mkdir -p target/doc/docs - cp -r target/doc/rustframe/* target/doc/docs/ + mv target/doc/rustframe/* target/doc/docs/ mkdir output cp tarpaulin-report.html target/doc/docs/ cp tarpaulin-report.json target/doc/docs/ cp tarpaulin-badge.json target/doc/docs/ cp last-commit-date.json target/doc/docs/ - mkdir -p target/doc/.github - cp .github/rustframe_logo.png target/doc/.github/rustframe_logo.png + mkdir -p target/doc/docs/.github + cp .github/rustframe_logo.png target/doc/docs/.github/ echo "" > target/doc/index.html - name: Upload Pages artifact From 41349e2dba5e398cf1c4b22ef2b543b6e613512b Mon Sep 17 00:00:00 2001 From: Palash Tyagi <23239946+Magnus167@users.noreply.github.com> Date: Mon, 5 May 2025 02:40:27 +0100 Subject: [PATCH 3/4] Update push trigger branch for docs-and-testcov workflow --- .github/workflows/docs-and-testcov.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs-and-testcov.yml b/.github/workflows/docs-and-testcov.yml index 00fa53f..630848d 100644 --- a/.github/workflows/docs-and-testcov.yml +++ b/.github/workflows/docs-and-testcov.yml @@ -6,7 +6,7 @@ concurrency: on: push: - branches: [main, update_docs_workflow] + branches: [main, fix_docs] # pull_request: # branches: [main] workflow_dispatch: From 00befe7ee488e456dd8e2df49f85b42b449a1fa8 Mon Sep 17 00:00:00 2001 From: Palash Tyagi <23239946+Magnus167@users.noreply.github.com> Date: Mon, 5 May 2025 02:44:17 +0100 Subject: [PATCH 4/4] Fix file path for rustframe logo in documentation output --- .github/workflows/docs-and-testcov.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs-and-testcov.yml b/.github/workflows/docs-and-testcov.yml index 630848d..9d1fb48 100644 --- a/.github/workflows/docs-and-testcov.yml +++ b/.github/workflows/docs-and-testcov.yml @@ -104,7 +104,7 @@ jobs: cp tarpaulin-badge.json target/doc/docs/ cp last-commit-date.json target/doc/docs/ mkdir -p target/doc/docs/.github - cp .github/rustframe_logo.png target/doc/docs/.github/ + cp .github/rustframe_logo.png target/doc/docs/.github/rustframe_logo.png echo "" > target/doc/index.html - name: Upload Pages artifact @@ -115,4 +115,4 @@ jobs: - name: Deploy to GitHub Pages # if: github.event_name == 'push' || github.event_name == 'workflow_dispatch' - uses: actions/deploy-pages@v4 \ No newline at end of file + uses: actions/deploy-pages@v4