Skip to content

Commit f8057b3

Browse files
committed
fix: string encoding
1 parent a4dbc2a commit f8057b3

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

build-frontend/action.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ runs:
7070
INPUT_DOCKER_REGISTRY_URL: ${{ inputs.docker_registry_url }}
7171
INPUT_PROJECT_NAME: ${{ inputs.project_name }}
7272
with:
73+
result-encoding: string
7374
script: |
7475
const base = {
7576
'NPM_EMAIL': core.getInput('npm_email'),
@@ -88,7 +89,7 @@ runs:
8889
...extraArgs,
8990
];
9091
91-
core.setOutput('docker_args', mergedArgs);
92+
core.setOutput('docker_args', mergedArgs.join('\n'));
9293
9394
const versionInput = core.getInput('version');
9495
core.setOutput('version', versionInput || context.sha);
@@ -126,4 +127,4 @@ runs:
126127
tags: ${{ steps.resolve.outputs.ref }}/vue-storefront:${{ steps.resolve.outputs.version }}
127128
cache-from: "type=registry,ref=${{ steps.resolve.outputs.ref }}/vue-storefront:buildcache"
128129
cache-to: "type=registry,ref=${{ steps.resolve.outputs.ref }}/vue-storefront:buildcache,mode=max"
129-
build-args: ${{ fromJson(steps.resolve.outputs.docker_args) }}
130+
build-args: ${{ steps.resolve.outputs.docker_args }}

build-middleware/action.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ runs:
6060
INPUT_DOCKER_REGISTRY_URL: ${{ inputs.docker_registry_url }}
6161
INPUT_PROJECT_NAME: ${{ inputs.project_name }}
6262
with:
63+
result-encoding: string
6364
script: |
6465
const base = {
6566
'NPM_EMAIL': core.getInput('npm_email'),
@@ -77,7 +78,7 @@ runs:
7778
...extraBuildArgs,
7879
];
7980
80-
core.setOutput('docker_args', mergedBuildArgs);
81+
core.setOutput('docker_args', mergedBuildArgs.join('\n'));
8182
8283
const versionInput = core.getInput('version');
8384
core.setOutput('version', versionInput || context.sha);
@@ -102,4 +103,4 @@ runs:
102103
tags: ${{ steps.resolve.outputs.ref }}/vue-storefront-middleware:${{ steps.resolve.outputs.version }}
103104
cache-from: "type=registry,ref=${{ steps.resolve.outputs.ref }}/vue-storefront-middleware:buildcache"
104105
cache-to: "type=registry,ref=${{ steps.resolve.outputs.ref }}/vue-storefront-middleware:buildcache,mode=max"
105-
build-args: ${{ fromJson(steps.resolve.outputs.docker_args) }}
106+
build-args: ${{ steps.resolve.outputs.docker_args }}

0 commit comments

Comments
 (0)