Try bash arrays

project-oak · May 24, 2024 · f1d6001 · f1d6001
1 parent 198d179
commit f1d6001
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 20 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -89,7 +89,7 @@ jobs:
           scripts/docker_pull
           scripts/docker_run "${BUILD_COMMAND[@]}"
 
-      - name: Show build artifact
+      - name: Show build artifacts
         run: |
           echo "${{ steps.parse.outputs.subject-paths }}"
           ls -la ${{ steps.parse.outputs.subject-paths }}

diff --git a/buildconfigs/key_xor_test_app.sh b/buildconfigs/key_xor_test_app.sh
@@ -16,4 +16,6 @@ export BUILD_COMMAND=(
   --release
 )
 
-export SUBJECT_PATHS=enclave_apps/target/x86_64-unknown-none/release/key_xor_test_app
+export SUBJECT_PATHS=(
+  enclave_apps/target/x86_64-unknown-none/release/key_xor_test_app
+)
diff --git a/buildconfigs/oak_containers_kernel.sh b/buildconfigs/oak_containers_kernel.sh
@@ -14,7 +14,8 @@ export BUILD_COMMAND=(
   oak_containers_kernel
 )
 
-export SUBJECT_PATHS="\
-oak_containers_kernel/target/bzImage \
-oak_containers_kernel/target/subjects/oak_containers_kernel_image \
-oak_containers_kernel/target/subjects/oak_containers_kernel_setup_data"
+export SUBJECT_PATHS=(
+  oak_containers_kernel/target/bzImage
+  oak_containers_kernel/target/subjects/oak_containers_kernel_image
+  oak_containers_kernel/target/subjects/oak_containers_kernel_setup_data
+)
diff --git a/buildconfigs/oak_containers_orchestrator.sh b/buildconfigs/oak_containers_orchestrator.sh
@@ -13,4 +13,6 @@ export BUILD_COMMAND=(
   oak_containers_orchestrator
 )
 
-export SUBJECT_PATHS=oak_containers_orchestrator/target/oak_containers_orchestrator
+export SUBJECT_PATHS=(
+  oak_containers_orchestrator/target/oak_containers_orchestrator
+)
diff --git a/buildconfigs/oak_containers_stage1.sh b/buildconfigs/oak_containers_stage1.sh
@@ -14,4 +14,6 @@ export BUILD_COMMAND=(
   make
 )
 
-export SUBJECT_PATHS=target/stage1.cpio
+export SUBJECT_PATHS=(
+  target/stage1.cpio
+)
diff --git a/buildconfigs/oak_containers_syslogd.sh b/buildconfigs/oak_containers_syslogd.sh
@@ -13,4 +13,6 @@ export BUILD_COMMAND=(
   oak_containers_syslogd
 )
 
-export SUBJECT_PATHS=oak_containers_syslogd/target/oak_containers_syslogd_patched
+export SUBJECT_PATHS=(
+  oak_containers_syslogd/target/oak_containers_syslogd_patched
+)
diff --git a/buildconfigs/oak_containers_system_image.sh b/buildconfigs/oak_containers_system_image.sh
@@ -13,4 +13,6 @@ export BUILD_COMMAND=(
   oak_containers_system_image
 )
 
-export SUBJECT_PATHS=oak_containers_system_image/target/image.tar.xz
+export SUBJECT_PATHS=(
+  oak_containers_system_image/target/image.tar.xz
+)
diff --git a/buildconfigs/oak_echo_enclave_app.sh b/buildconfigs/oak_echo_enclave_app.sh
@@ -16,4 +16,6 @@ export BUILD_COMMAND=(
   --release
 )
 
-export SUBJECT_PATHS=enclave_apps/target/x86_64-unknown-none/release/oak_echo_enclave_app
+export SUBJECT_PATHS=(
+  enclave_apps/target/x86_64-unknown-none/release/oak_echo_enclave_app
+)
diff --git a/buildconfigs/oak_echo_raw_enclave_app.sh b/buildconfigs/oak_echo_raw_enclave_app.sh
@@ -16,4 +16,6 @@ export BUILD_COMMAND=(
   --release
 )
 
-export SUBJECT_PATHS=enclave_apps/target/x86_64-unknown-none/release/oak_echo_raw_enclave_app
+export SUBJECT_PATHS=(
+  enclave_apps/target/x86_64-unknown-none/release/oak_echo_raw_enclave_app
+)
diff --git a/buildconfigs/oak_functions_enclave_app.sh b/buildconfigs/oak_functions_enclave_app.sh
@@ -16,4 +16,6 @@ export BUILD_COMMAND=(
   --release
 )
 
-export SUBJECT_PATHS=enclave_apps/target/x86_64-unknown-none/release/oak_functions_enclave_app
+export SUBJECT_PATHS=(
+  enclave_apps/target/x86_64-unknown-none/release/oak_functions_enclave_app
+)
diff --git a/buildconfigs/oak_functions_insecure_enclave_app.sh b/buildconfigs/oak_functions_insecure_enclave_app.sh
@@ -18,4 +18,6 @@ export BUILD_COMMAND=(
   --features=allow_sensitive_logging
 )
 
-export SUBJECT_PATHS=enclave_apps/target/x86_64-unknown-none/release/oak_functions_insecure_enclave_app
+export SUBJECT_PATHS=(
+  enclave_apps/target/x86_64-unknown-none/release/oak_functions_insecure_enclave_app
+)
diff --git a/buildconfigs/oak_ml_transparency_eval.sh b/buildconfigs/oak_ml_transparency_eval.sh
@@ -14,4 +14,6 @@ export BUILD_COMMAND=(
   --output=claim.json
 )
 
-export SUBJECT_PATHS=oak_ml_transparency/mnist/claim.json
+export SUBJECT_PATHS=(
+  oak_ml_transparency/mnist/claim.json
+)
diff --git a/buildconfigs/oak_orchestrator.sh b/buildconfigs/oak_orchestrator.sh
@@ -16,4 +16,6 @@ export BUILD_COMMAND=(
   --release
 )
 
-export SUBJECT_PATHS=enclave_apps/target/x86_64-unknown-none/release/oak_orchestrator
+export SUBJECT_PATHS=(
+  enclave_apps/target/x86_64-unknown-none/release/oak_orchestrator
+)
diff --git a/buildconfigs/oak_restricted_kernel_simple_io_init_rd_wrapper_bin.sh b/buildconfigs/oak_restricted_kernel_simple_io_init_rd_wrapper_bin.sh
@@ -13,7 +13,8 @@ export BUILD_COMMAND=(
   oak_restricted_kernel_simple_io_init_rd_wrapper
 )
 
-export SUBJECT_PATHS="\
-oak_restricted_kernel_wrapper/target/x86_64-unknown-none/release/oak_restricted_kernel_simple_io_init_rd_wrapper_bin \
-oak_restricted_kernel_wrapper/target/oak_restricted_kernel_simple_io_init_rd/subjects/oak_restricted_kernel_simple_io_init_rd_image \
-oak_restricted_kernel_wrapper/target/oak_restricted_kernel_simple_io_init_rd/subjects/oak_restricted_kernel_simple_io_init_rd_setup_data"
+export SUBJECT_PATHS=(
+  oak_restricted_kernel_wrapper/target/x86_64-unknown-none/release/oak_restricted_kernel_simple_io_init_rd_wrapper_bin
+  oak_restricted_kernel_wrapper/target/oak_restricted_kernel_simple_io_init_rd/subjects/oak_restricted_kernel_simple_io_init_rd_image
+  oak_restricted_kernel_wrapper/target/oak_restricted_kernel_simple_io_init_rd/subjects/oak_restricted_kernel_simple_io_init_rd_setup_data
+)