fix: string encoding

vuestorefront · Oct 22, 2024 · f8057b3 · f8057b3
1 parent a4dbc2a
commit f8057b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/build-frontend/action.yml b/build-frontend/action.yml
@@ -70,6 +70,7 @@ runs:
         INPUT_DOCKER_REGISTRY_URL: ${{ inputs.docker_registry_url }}
         INPUT_PROJECT_NAME: ${{ inputs.project_name }}
       with:
+        result-encoding: string
         script: |
           const base = {
             'NPM_EMAIL': core.getInput('npm_email'),
@@ -88,7 +89,7 @@ runs:
             ...extraArgs,
           ];
 
-          core.setOutput('docker_args', mergedArgs);
+          core.setOutput('docker_args', mergedArgs.join('\n'));
 
           const versionInput = core.getInput('version');
           core.setOutput('version', versionInput || context.sha);
@@ -126,4 +127,4 @@ runs:
         tags: ${{ steps.resolve.outputs.ref }}/vue-storefront:${{ steps.resolve.outputs.version }}
         cache-from: "type=registry,ref=${{ steps.resolve.outputs.ref }}/vue-storefront:buildcache"
         cache-to: "type=registry,ref=${{ steps.resolve.outputs.ref }}/vue-storefront:buildcache,mode=max"
-        build-args: ${{ fromJson(steps.resolve.outputs.docker_args) }}
+        build-args: ${{ steps.resolve.outputs.docker_args }}
diff --git a/build-middleware/action.yml b/build-middleware/action.yml
@@ -60,6 +60,7 @@ runs:
         INPUT_DOCKER_REGISTRY_URL: ${{ inputs.docker_registry_url }}
         INPUT_PROJECT_NAME: ${{ inputs.project_name }}
       with:
+        result-encoding: string
         script: |
           const base = {
             'NPM_EMAIL': core.getInput('npm_email'),
@@ -77,7 +78,7 @@ runs:
             ...extraBuildArgs,
           ];
 
-          core.setOutput('docker_args', mergedBuildArgs);
+          core.setOutput('docker_args', mergedBuildArgs.join('\n'));
 
           const versionInput = core.getInput('version');
           core.setOutput('version', versionInput || context.sha);
@@ -102,4 +103,4 @@ runs:
         tags: ${{ steps.resolve.outputs.ref }}/vue-storefront-middleware:${{ steps.resolve.outputs.version }}
         cache-from: "type=registry,ref=${{ steps.resolve.outputs.ref }}/vue-storefront-middleware:buildcache"
         cache-to: "type=registry,ref=${{ steps.resolve.outputs.ref }}/vue-storefront-middleware:buildcache,mode=max"
-        build-args: ${{ fromJson(steps.resolve.outputs.docker_args) }}
+        build-args: ${{ steps.resolve.outputs.docker_args }}