Skip to content

Commit

Permalink
scripts: enable C++ module examples
Browse files Browse the repository at this point in the history
  • Loading branch information
daviddrysdale committed May 26, 2020
1 parent 64fc9ce commit 61c9c86
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
11 changes: 9 additions & 2 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,17 @@ steps:
entrypoint: 'bash'
args: ['./scripts/run_examples', '-s', 'base']

- name: 'gcr.io/oak-ci/oak:latest'
id: run_examples_cpp
waitFor: ['run_examples']
timeout: 60m
entrypoint: 'bash'
args: ['./scripts/run_examples', '-s', 'base', '-l', 'cpp']

# Run clang-tidy after the examples finish running, since they share the same `output_base`.
- name: 'gcr.io/oak-ci/oak:latest'
id: run_clang_tidy
waitFor: ['run_examples']
waitFor: ['run_examples_cpp']
timeout: 30m
entrypoint: 'bash'
args: ['./scripts/run_clang_tidy']
Expand All @@ -96,7 +103,7 @@ steps:
# ignored by git.
- name: 'gcr.io/oak-ci/oak:latest'
id: git_check_diff
waitFor: ['git_init', 'run_clang_tidy', 'run_examples']
waitFor: ['git_init', 'run_clang_tidy', 'run_examples_cpp']
timeout: 5m
entrypoint: 'bash'
args: ['./scripts/git_check_diff']
Expand Down
3 changes: 1 addition & 2 deletions scripts/run_examples
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ done
# Run all examples.
for language in ${languages}; do
# TODO(#594): Re-enable rustfmt when upstream rustc internal error is fixed.
# TODO(#1009): Re-enable C++ tensorflow example after supporting them with Rust Oak Loader.
examples="$(find examples -mindepth 2 -maxdepth 4 -type d -regex '.*/module.*/'"${language}"'$' | cut -d'/' -f2 | uniq | grep -v rustfmt | grep -v tensorflow)"
examples="$(find examples -mindepth 2 -maxdepth 4 -type d -regex '.*/module.*/'"${language}"'$' | cut -d'/' -f2 | uniq | grep -v rustfmt)"
for example in ${examples}; do
if [[ "${example}" == "chat" ]]; then
"${SCRIPTS_DIR}/run_example" -s "${server}" -l "${language}" -e chat -- --test
Expand Down

0 comments on commit 61c9c86

Please sign in to comment.