From 338eede3fc87c888d37e16bebf035f177d574061 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Tue, 8 Oct 2024 16:38:44 +0800 Subject: [PATCH] add a job for testing Signed-off-by: Yuanhao Ji --- .github/workflows/ci-subaction.yml | 20 ++++++++++++++++++++ subaction/list-targets/action.yml | 7 +------ test/multi-files/docker-bake.hcl | 15 +++++++++++++++ test/multi-files/docker-bake.json | 14 ++++++++++++++ 4 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 test/multi-files/docker-bake.hcl create mode 100644 test/multi-files/docker-bake.json diff --git a/.github/workflows/ci-subaction.yml b/.github/workflows/ci-subaction.yml index 0a9e85a..2525130 100644 --- a/.github/workflows/ci-subaction.yml +++ b/.github/workflows/ci-subaction.yml @@ -59,3 +59,23 @@ jobs: name: Show matrix run: | echo matrix=${{ steps.gen.outputs.matrix }} + + list-targets-multi-files: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v4 + - + name: Matrix gen + id: gen + uses: ./subaction/list-targets + with: + workdir: ./multi-files + files: | + docker-bake.json + docker-bake.hcl + - + name: Show matrix + run: | + echo matrix=${{ steps.gen.outputs.matrix }} diff --git a/subaction/list-targets/action.yml b/subaction/list-targets/action.yml index 8024a96..0aa48e2 100644 --- a/subaction/list-targets/action.yml +++ b/subaction/list-targets/action.yml @@ -29,12 +29,7 @@ runs: with: script: | let def; - const files = `${{ inputs.files }}` - ? `${{ inputs.files }}` - .replace(/\n/g, ',') - .split(',') - .filter(Boolean) - : []; + const files = `${{ inputs.files }}` ? `${{ inputs.files }}`.split(/[\r?\n,]+/).filter(Boolean) : []; const target = `${{ inputs.target }}`; await core.group(`Validating definition`, async () => { diff --git a/test/multi-files/docker-bake.hcl b/test/multi-files/docker-bake.hcl new file mode 100644 index 0000000..be746a4 --- /dev/null +++ b/test/multi-files/docker-bake.hcl @@ -0,0 +1,15 @@ +group "default" { + targets = ["t3"] +} + +target "t3" { + name = "${item.tag}" + matrix = { + item = t3 + } + args = { + VERSION = "${item.version}" + DUMMY_ARG = "${item.arg}" + } + tags = ["${item.tag}"] +} diff --git a/test/multi-files/docker-bake.json b/test/multi-files/docker-bake.json new file mode 100644 index 0000000..d188bfa --- /dev/null +++ b/test/multi-files/docker-bake.json @@ -0,0 +1,14 @@ +{ + "t3": [ + { + "version": "v1", + "arg": "v1-value", + "tag": "v1-tag" + }, + { + "version": "v2", + "arg": "v2-value", + "tag": "v2-tag" + } + ] +} \ No newline at end of file