From f1d600156984155fd3f8352e0ef4298211d1d7cb Mon Sep 17 00:00:00 2001 From: Tom Binder Date: Fri, 24 May 2024 17:15:57 +0000 Subject: [PATCH] Try bash arrays --- .github/workflows/build.yaml | 2 +- buildconfigs/key_xor_test_app.sh | 4 +++- buildconfigs/oak_containers_kernel.sh | 9 +++++---- buildconfigs/oak_containers_orchestrator.sh | 4 +++- buildconfigs/oak_containers_stage1.sh | 4 +++- buildconfigs/oak_containers_syslogd.sh | 4 +++- buildconfigs/oak_containers_system_image.sh | 4 +++- buildconfigs/oak_echo_enclave_app.sh | 4 +++- buildconfigs/oak_echo_raw_enclave_app.sh | 4 +++- buildconfigs/oak_functions_enclave_app.sh | 4 +++- buildconfigs/oak_functions_insecure_enclave_app.sh | 4 +++- buildconfigs/oak_ml_transparency_eval.sh | 4 +++- buildconfigs/oak_orchestrator.sh | 4 +++- ...ak_restricted_kernel_simple_io_init_rd_wrapper_bin.sh | 9 +++++---- 14 files changed, 44 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 14d890af5b7..a7c70fa0c11 100644 --- 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 index b21c264707e..6abf327405b 100644 --- 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 index 1266d3553f8..c13eb938401 100644 --- 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 index 0444661af40..6740b2abf25 100644 --- 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 index ede3513fbea..c40c48d9ba3 100644 --- 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 index b0fb0ed28f0..34cccee29ae 100644 --- 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 index 2a7ef52582f..2c5e7fc441c 100644 --- 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 index 7397af13bce..fc611f171d1 100644 --- 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 index c8901bca3ee..eb6a198fbf1 100644 --- 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 index 672e1286c8f..82ee4cd8806 100644 --- 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 index d0c249566d4..60ab9e31f16 100644 --- 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 index 7b493bb0873..abc127b42ff 100644 --- 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 index 9ebc70d0895..a5b7e70c516 100644 --- 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 index b9675a4dfd8..d679055e117 100644 --- 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 +)