From 1f5e6da19c7aff099124cb8f7d3036515db73e8c Mon Sep 17 00:00:00 2001 From: lowlighter <22963968+lowlighter@users.noreply.github.com> Date: Sun, 16 Jan 2022 23:37:37 -0500 Subject: [PATCH] fix: markdown tests in ci --- .github/scripts/build.mjs | 3 +++ .github/scripts/quickstart/index.mjs | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/examples.yml | 11 +++++++---- source/app/action/index.mjs | 2 +- source/templates/markdown/examples.yml | 12 ++++++++++++ 6 files changed, 25 insertions(+), 7 deletions(-) diff --git a/.github/scripts/build.mjs b/.github/scripts/build.mjs index 9e35eb0b..ddc02e33 100644 --- a/.github/scripts/build.mjs +++ b/.github/scripts/build.mjs @@ -173,6 +173,9 @@ function testcase(name, env, args) { result.if = "${{ success() || failure() }}" result.uses = "lowlighter/metrics@master" Object.assign(result.with, { plugins_errors_fatal: "yes", output_action: "none", delay: 5 }) + + if ((context.with?.output_action)&&(context.with?.committer_branch === "examples")) + Object.assign(result.with, { output_action:context.with.output_action, committer_branch:"examples" }) } if (env === "test") { diff --git a/.github/scripts/quickstart/index.mjs b/.github/scripts/quickstart/index.mjs index 237d6659..61b8e3d7 100644 --- a/.github/scripts/quickstart/index.mjs +++ b/.github/scripts/quickstart/index.mjs @@ -18,7 +18,7 @@ if (!["plugin", "template"].includes(mode)) throw new Error(`Unsupported mode ${mode}`) //Check if target directory already exists -const target = paths.join(__metrics, `source/${mode}s`, name) +const target = paths.join(__metrics, `source/${{plugin:"plugins/community", template:"templates"}[mode]}`, name) if (fs.existsSync(target)) throw new Error(`A ${mode} named ${name} already exists!`) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 403b54f5..4be1cceb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -176,7 +176,7 @@ jobs: update-latest: name: Rebase latest on master runs-on: ubuntu-latest - needs: [ docker-release ] + needs: [ docker-release, publish-examples ] steps: - name: Checkout repository uses: actions/checkout@v2 diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index d0c7b5a4..2f404150 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -977,8 +977,9 @@ jobs: markdown: metrics.markdown.template.md config_output: markdown token: ${{ secrets.METRICS_TOKEN }} - plugins_errors_fatal: yes output_action: none + committer_branch: examples + plugins_errors_fatal: yes delay: 5 if: ${{ success() || failure() }} - name: 📒 Markdown template - Example with plugins configuration for embed use @@ -1011,8 +1012,9 @@ jobs: plugin_isocalendar: yes plugin_languages: yes token: ${{ secrets.METRICS_TOKEN }} - plugins_errors_fatal: yes output_action: none + committer_branch: examples + plugins_errors_fatal: yes delay: 5 if: ${{ success() || failure() }} - name: 📒 Markdown template - Example (pdf output) @@ -1030,8 +1032,9 @@ jobs: config_twemoji: yes config_padding: 5% token: ${{ secrets.METRICS_TOKEN }} - plugins_errors_fatal: yes output_action: none + committer_branch: examples + plugins_errors_fatal: yes delay: 5 if: ${{ success() || failure() }} - name: 📕 Community templates - Using a community template @@ -1054,7 +1057,7 @@ jobs: output_action: none delay: 5 if: ${{ success() || failure() }} - + - name: Publish examples if: ${{ success() || failure() }} diff --git a/source/app/action/index.mjs b/source/app/action/index.mjs index 2707f50a..4c1a77fb 100644 --- a/source/app/action/index.mjs +++ b/source/app/action/index.mjs @@ -33,7 +33,7 @@ info.section = (left = "", right = " ") => info(`\x1b[36m${left}\x1b[0m`, right) info.group = ({metadata, name, inputs}) => { info.section(metadata.plugins[name]?.name?.match(/(?
[\w\s]+)/i)?.groups?.section?.trim(), " ") for (const [input, value] of Object.entries(inputs)) - info(metadata.plugins[name]?.inputs[input]?.description ?? input, value, {token:metadata.plugins[name]?.inputs[input]?.type === "token"}) + info(metadata.plugins[name]?.inputs[input]?.description?.split("\n")[0] ?? metadata.plugins[name]?.inputs[input]?.description ?? input, value, {token:metadata.plugins[name]?.inputs[input]?.type === "token"}) } info.break = () => console.log("─".repeat(88)) diff --git a/source/templates/markdown/examples.yml b/source/templates/markdown/examples.yml index ec0a3a8f..b8de3f17 100644 --- a/source/templates/markdown/examples.yml +++ b/source/templates/markdown/examples.yml @@ -6,6 +6,10 @@ markdown: metrics.markdown.template.md config_output: markdown token: ${{ secrets.METRICS_TOKEN }} + prod: + with: + output_action: commit + committer_branch: examples - name: Example with plugins configuration for embed use uses: lowlighter/metrics@latest @@ -36,6 +40,10 @@ plugin_isocalendar: yes plugin_languages: yes token: ${{ secrets.METRICS_TOKEN }} + prod: + with: + output_action: commit + committer_branch: examples - name: Example (pdf output) uses: lowlighter/metrics@latest @@ -51,3 +59,7 @@ config_twemoji: yes config_padding: 5% token: ${{ secrets.METRICS_TOKEN }} + prod: + with: + output_action: commit + committer_branch: examples \ No newline at end of file