Skip to content

Commit

Permalink
Add system image. Remove pretend build.
Browse files Browse the repository at this point in the history
  • Loading branch information
thmsbinder committed May 14, 2024
1 parent b297190 commit 1e35660
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 15 deletions.
22 changes: 7 additions & 15 deletions .github/workflows/provenance5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
matrix:
buildconfig:
- buildconfigs/key_xor_test_app.sh
- buildconfigs/oak_containers_system_image.sh
- buildconfigs/oak_echo_raw_enclave_app.sh

permissions:
Expand All @@ -33,7 +34,6 @@ jobs:
run: |
set -o errexit
set -o nounset
set -o xtrace
set -o pipefail
source ${{ matrix.buildconfig }}
echo "package-name=${package_name}" >> $GITHUB_OUTPUT
Expand All @@ -42,26 +42,18 @@ jobs:
- name: Show values
run: |
set -euo pipefail
echo "${{ steps.parse.outputs.package-name }}"
echo "${{ steps.parse.outputs.binary-path }}"
echo "${{ steps.parse.outputs.subject-path }}"
- name: Pretend build
id: pretend
run: |
set -euo pipefail
dir="$(dirname ${{ steps.parse.outputs.binary-path }})"
base="$(basename ${{ steps.parse.outputs.binary-path }})"
mkdir -p $dir
echo "${base}" > ${{ steps.parse.outputs.binary-path }}
set -o errexit
set -o nounset
set -o pipefail
echo "package_name: ${{ steps.parse.outputs.package-name }}"
echo "binary_path: ${{ steps.parse.outputs.binary-path }}"
echo "subject_path: ${{ steps.parse.outputs.subject-path }}"
- name: Build
id: build
run: |
set -o errexit
set -o nounset
set -o xtrace
set -o pipefail
source ${{ matrix.buildconfig }}
export RUST_BACKTRACE=1
Expand Down
15 changes: 15 additions & 0 deletions buildconfigs/oak_containers_system_image.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/sh

package_name=oak_containers_system_image

declare -a build_command=(
nix
develop
.#systemImageProvenance
--command
just
oak_containers_system_image
)

binary_path=oak_containers_system_image/target/image.tar.xz
subject_path="${binary_path}"

0 comments on commit 1e35660

Please sign in to comment.