Feed build args as JSON to action

rstudio · Jul 21, 2023 · fe7a0d9 · fe7a0d9
1 parent e21d99e
commit fe7a0d9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/actions/build-test-scan-push/action.yaml b/.github/actions/build-test-scan-push/action.yaml
@@ -86,7 +86,7 @@ runs:
         cache-from: type=gha
         cache-to: type=gha
         build-args: |
-          ${{ inputs.build-args }}
+          ${{ join(fromJSON(inputs.build-args), "\n") }}
         tags: ${{ inputs.image-tags }}
 
     - name: Get first tag

diff --git a/ci.Justfile b/ci.Justfile
@@ -119,12 +119,12 @@ get-base-args $OS $TYPE="base" $BRANCH=`git branch --show`:
   else
     _DRIVERS_VERSION="{{ DRIVERS_VERSION }}"
   fi
-  printf "R_VERSION={{ R_VERSION }}
-  R_VERSION_ALT={{ R_VERSION_ALT }}
-  PYTHON_VERSION={{ PYTHON_VERSION }}
-  PYTHON_VERSION_ALT={{ PYTHON_VERSION_ALT }}
-  DRIVERS_VERSION=${_DRIVERS_VERSION}
-  SRC_IMAGE_NAME=${SRC_IMAGE_NAME}"
+  echo "[\"R_VERSION={{ R_VERSION }}\",\
+  \"R_VERSION_ALT={{ R_VERSION_ALT }}\",\
+  \"PYTHON_VERSION={{ PYTHON_VERSION }}\",\
+  \"PYTHON_VERSION_ALT={{ PYTHON_VERSION_ALT }}\",\
+  \"DRIVERS_VERSION=${_DRIVERS_VERSION}\",\
+  \"SRC_IMAGE_NAME=${SRC_IMAGE_NAME}\"]"
 
 get-base-tags $OS $TYPE="base" $BRANCH=`git branch --show`:
   #!/usr/bin/env bash