Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable tracing behind feature flag #159

Merged
merged 6 commits into from
Sep 12, 2023
Merged

Enable tracing behind feature flag #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dc59761
Clean up indentation in run-enclave performance test script
crawford Sep 7, 2023
37de4dd
Minor cleanup of translation from CLISuccess to ExitCode
crawford Sep 7, 2023
c5626fd
Don't build with --all-features
crawford Sep 8, 2023
ac602d6
Be explicit about use of buildx Docker plugin
crawford Sep 8, 2023
442686c
Run enclaver by default when unspecified
crawford Sep 12, 2023
ae8e6cc
Enable tracing behind feature flag
crawford Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,18 @@ jobs:
- run: rustup toolchain install $RUSTUP_TOOLCHAIN
- run: rustup component add clippy

# Check with --all-features (ie a Linux build)
# Check all binaries (ie a Linux build)
- uses: actions-rs/clippy-check@v1.0.7
with:
args: --all-features --manifest-path enclaver/Cargo.toml
args: --features=run_enclave,odyn --manifest-path enclaver/Cargo.toml
token: ${{ secrets.GITHUB_TOKEN }}

# Check with tracing enabled
- uses: actions-rs/clippy-check@v1.0.7
env:
RUSTFLAGS: "-Dwarnings --cfg=tokio_unstable"
with:
args: --features=run_enclave,odyn,tracing --manifest-path enclaver/Cargo.toml
token: ${{ secrets.GITHUB_TOKEN }}

# Check with only default features (ie a Mac build)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
- target: 'x86_64-unknown-linux-musl'
host: 'ubuntu-latest'
uses_musl: true
extra_cargo_args: '--all-features'
extra_cargo_args: '--features=run_enclave,odyn'
- target: 'aarch64-unknown-linux-musl'
host: 'ubuntu-latest'
uses_musl: true
extra_cargo_args: '--all-features'
extra_cargo_args: '--features=run_enclave,odyn'
- target: 'x86_64-apple-darwin'
host: 'macos-latest'
- target: 'aarch64-apple-darwin'
Expand Down
6 changes: 3 additions & 3 deletions build/local_image_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ cd $enclaver_dir
docker_build_dir=$(mktemp -d)
trap "rm --force --recursive ${docker_build_dir}" EXIT

cargo build --target $rust_target --all-features
cargo build --target $rust_target --features run_enclave,odyn

cp $rust_target_dir/odyn $docker_build_dir/
cp $rust_target_dir/enclaver-run $docker_build_dir/

docker build \
docker buildx build \
-f ../build/dockerfiles/odyn-dev.dockerfile \
-t ${odyn_tag} \
${docker_build_dir}

docker build \
docker buildx build \
-f ../build/dockerfiles/runtimebase-dev.dockerfile \
-t ${wrapper_base_tag} \
${docker_build_dir}
Expand Down
Loading
Loading