From 5a922a7f5a6e5cc0d0db99a00f30218f640c74c4 Mon Sep 17 00:00:00 2001 From: penumbra23 Date: Wed, 3 Jul 2024 11:31:14 +0200 Subject: [PATCH 1/2] Move message format in front of args --- .github/actions/cargo-command/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/cargo-command/action.yaml b/.github/actions/cargo-command/action.yaml index 0368c65b6..c6ed7287c 100644 --- a/.github/actions/cargo-command/action.yaml +++ b/.github/actions/cargo-command/action.yaml @@ -52,4 +52,4 @@ runs: env: CARGO_TERM_COLOR: always shell: bash - run: cargo ${{ inputs.command }} ${{ inputs.package != '' && '--package' || '' }} ${{ inputs.package }} --profile '${{ inputs.profile }}' --features '${{ inputs.features }}' ${{ inputs.args }} --message-format json | cargo-action-fmt + run: cargo ${{ inputs.command }} ${{ inputs.package != '' && '--package' || '' }} ${{ inputs.package }} --profile '${{ inputs.profile }}' --features '${{ inputs.features }}' --message-format json ${{ inputs.args }} | cargo-action-fmt From c840c9c74fde5b5fd0b4b539e8f9aacf193b0106 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Wed, 3 Jul 2024 11:56:24 +0200 Subject: [PATCH 2/2] ci: assemble docs outside of cached dir --- .github/workflows/merge-pages-docs.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/merge-pages-docs.yaml b/.github/workflows/merge-pages-docs.yaml index 005c3e4ae..9c3f9ee2e 100644 --- a/.github/workflows/merge-pages-docs.yaml +++ b/.github/workflows/merge-pages-docs.yaml @@ -41,12 +41,12 @@ jobs: env: DOCS_HIDEOUT: an8ohgahmoot6ro8ieReib9micau0Oow run: | - mkdir target/docs - cp -r target/doc target/docs/$DOCS_HIDEOUT - cp docs/robots.txt target/docs/$DOCS_HIDEOUT + mkdir dist + cp -r target/doc dist/$DOCS_HIDEOUT + cp docs/robots.txt dist/$DOCS_HIDEOUT - name: Upload docs uses: actions/upload-pages-artifact@v3 with: - path: target/docs + path: dist - name: Deploy to GitHub Pages uses: actions/deploy-pages@v4