diff --git a/.github/readme/partials/documentation/setup/docker.md b/.github/readme/partials/documentation/setup/docker.md index b1059c37..3260e0ad 100644 --- a/.github/readme/partials/documentation/setup/docker.md +++ b/.github/readme/partials/documentation/setup/docker.md @@ -8,7 +8,7 @@ A server with a recent version of [docker](https://www.docker.com/) is required. The command to use is similar to the following: ```shell -docker run --env INPUT_TOKEN=**** --env INPUT_USER=user --volume=/tmp:/metrics_renders ghcr.io/lowlighter/metrics:latest +docker run --env INPUT_TOKEN=**** --env INPUT_USER=user --volume=/tmp:/renders ghcr.io/lowlighter/metrics:latest ``` To pass parameters, pass environment variable with the same name as the corresponding action option but in uppercase and prefixed with `INPUT_`. diff --git a/.github/scripts/build.mjs b/.github/scripts/build.mjs index a9973f89..172aaedb 100644 --- a/.github/scripts/build.mjs +++ b/.github/scripts/build.mjs @@ -158,6 +158,7 @@ async function template(id) { function testcase(name, env, args) { const { prod = {}, test = {}, ...step } = JSON.parse(JSON.stringify(args)) const context = { prod, test }[env] ?? {} + const {with:overrides} = context if (context.skip) return null @@ -178,8 +179,9 @@ function testcase(name, env, args) { if (!(property in result.with)) result.with[property] = value } - if ((context.with?.output_action) && (context.with?.committer_branch === "examples")) - Object.assign(result.with, { output_action: context.with.output_action, committer_branch: "examples" }) + if ((overrides?.output_action) && (overrides?.committer_branch === "examples")) { + Object.assign(result.with, { output_action: overrides.output_action, committer_branch: "examples" }) + } } if (env === "test") { diff --git a/.github/scripts/files/examples.yml b/.github/scripts/files/examples.yml index 0d5cc62c..834e4145 100644 --- a/.github/scripts/files/examples.yml +++ b/.github/scripts/files/examples.yml @@ -42,8 +42,8 @@ jobs: - name: Screenshot markdown example if: ${{ success() || failure() }} run: | - node /metrics/.github/scripts/markdown_example.mjs - mv metrics.markdown.png / + docker run --entrypoint="" --volume=/tmp:/tmp ghcr.io/lowlighter/metrics:master node /metrics/.github/scripts/markdown_example.mjs + sudo mv /tmp/metrics.markdown.png /metrics_renders/ - name: Publish examples if: ${{ success() || failure() }} run: | diff --git a/.github/scripts/markdown_example.mjs b/.github/scripts/markdown_example.mjs index fa2c4d90..6fbcde92 100644 --- a/.github/scripts/markdown_example.mjs +++ b/.github/scripts/markdown_example.mjs @@ -17,5 +17,5 @@ const clip = await page.evaluate(() => { const { x, y, width, height } = document.querySelector("#readme").getBoundingClientRect() return { x, y, width, height } }) -await page.screenshot({ type: "png", path: "metrics.markdown.png", clip, omitBackground: true }) +await page.screenshot({ type: "png", path: "/tmp/metrics.markdown.png", clip, omitBackground: true }) await browser.close() diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index c48652cf..7ec6eb53 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -1045,7 +1045,7 @@ jobs: markdown: metrics.markdown.template.md config_output: markdown token: ${{ secrets.METRICS_TOKEN }} - output_action: none + output_action: commit committer_branch: examples delay: 120 user: lowlighter @@ -1081,7 +1081,7 @@ jobs: plugin_isocalendar: yes plugin_languages: yes token: ${{ secrets.METRICS_TOKEN }} - output_action: none + output_action: commit committer_branch: examples delay: 120 user: lowlighter @@ -1102,7 +1102,7 @@ jobs: config_twemoji: yes config_padding: 5% token: ${{ secrets.METRICS_TOKEN }} - output_action: none + output_action: commit committer_branch: examples delay: 120 user: lowlighter @@ -1135,8 +1135,8 @@ jobs: - name: Screenshot markdown example if: ${{ success() || failure() }} run: | - node /metrics/.github/scripts/markdown_example.mjs - mv metrics.markdown.png / + docker run --entrypoint="" --volume=/tmp:/tmp ghcr.io/lowlighter/metrics:master node /metrics/.github/scripts/markdown_example.mjs + sudo mv /tmp/metrics.markdown.png /metrics_renders/ - name: Publish examples if: ${{ success() || failure() }} run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a4b47bd6..6e3f6c89 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -45,7 +45,7 @@ jobs: - name: Build lowlighter/metrics:${{ github.head_ref || 'master' }} run: docker build -t lowlighter/metrics:$(echo ${{ github.head_ref || 'master' }} | sed 's/\//-/g') . - name: Run tests - run: docker run --workdir=/metrics --entrypoint="" lowlighter/metrics:$(echo ${{ github.head_ref || 'master' }} | sed 's/\//-/g') npm test -- metrics.test.js + run: docker run --entrypoint="" lowlighter/metrics:$(echo ${{ github.head_ref || 'master' }} | sed 's/\//-/g') npm test -- metrics.test.js # Run CodeQL on branch analyze: