Merge remote-tracking branch 'origin/main' into ergonomic-protos

project-oak · Jan 26, 2024 · d274752 · d274752
2 parents 16f0b7a + 2805871
commit d274752
Show file tree

Hide file tree

Showing 179 changed files with 4,589 additions and 1,668 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -8,6 +8,8 @@
 rustflags = [
   "-C",
   "link-args=-Xlinker --build-id=none",
+  "-C",
+  "target-cpu=x86-64-v3",
   # Enable `tokio_unstable` so that we can access the Tokio runtime metrics.
   "--cfg",
   "tokio_unstable"
@@ -23,6 +25,8 @@ rustflags = [
 rustflags = [
   "-C",
   "link-args=-Xlinker --build-id=none",
+  "-C",
+  "target-cpu=x86-64-v3",
   # Enable `tokio_unstable` so that we can access the Tokio runtime metrics.
   "--cfg",
   "tokio_unstable"

diff --git a/.github/workflows/provenance.yaml b/.github/workflows/provenance.yaml
@@ -19,19 +19,20 @@ jobs:
     if: |
       github.event_name == 'push' ||
       contains(github.event.pull_request.labels.*.name, 'provenance:force-run')
+
     # We use the same job template to generate provenances for multiple binaries.
     strategy:
       fail-fast: false
       matrix:
         buildconfig:
           - buildconfigs/key_xor_test_app.toml
+          - buildconfigs/oak_containers_kernel_bzimage.toml
+          - buildconfigs/oak_containers_stage1_cpio.toml
           - buildconfigs/oak_echo_enclave_app.toml
           - buildconfigs/oak_echo_raw_enclave_app.toml
-          - buildconfigs/oak_restricted_kernel_bin.toml
-          - buildconfigs/oak_restricted_kernel_simple_io_bin.toml
-          - buildconfigs/oak_restricted_kernel_simple_io_wrapper.toml
           - buildconfigs/oak_functions_enclave_app.toml
           - buildconfigs/oak_functions_insecure_enclave_app.toml
+          - buildconfigs/oak_restricted_kernel_simple_io_wrapper.toml
           - buildconfigs/stage0_bin.toml
 
     permissions: