Skip to content

BYO_CRYPTO #254

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

Merged
merged 9 commits into from
Apr 9, 2021
Merged

BYO_CRYPTO #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7d7f450
BYO_CRYPTO
graebm Mar 22, 2021
5d34222
Merge branch 'main' into BYO_CRYPTO
graebm Apr 6, 2021
0fba0d4
aws-crt-cpp to latest on BYO_CRYPTO branch
graebm Apr 6, 2021
221bcbc
aws-crt-cpp synced to main
graebm Apr 9, 2021
2e682ae
Merge branch 'main' into BYO_CRYPTO
graebm Apr 9, 2021
0fb8495
add CI job
graebm Apr 9, 2021
5dc3aa9
Don't build samples in byo-crypto CI
graebm Apr 9, 2021
e8570a2
typo
graebm Apr 9, 2021
f0d6522
Merge branch 'main' into BYO_CRYPTO
graebm Apr 9, 2021
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
32 changes: 32 additions & 0 deletions .builder/actions/build_samples.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import Builder
import os
import sys


class BuildSamples(Builder.Action):
def run(self, env):
if env.args.cli_config['variables'].get('skip_samples', "0") != "0":
print('skip_samples is defined. Skipping samples...')
return

steps = []
samples = [
'samples/mqtt/basic_pub_sub',
'samples/mqtt/raw_pub_sub',
'samples/shadow/shadow_sync',
'samples/greengrass/basic_discovery',
'samples/identity/fleet_provisioning',
'samples/jobs/describe_job_execution',
]
for sample_path in samples:
build_path = os.path.join('build', sample_path)
steps.append(['cmake',
f'-B{build_path}',
f'-H{sample_path}',
f'-DCMAKE_PREFIX_PATH={env.install_dir}',
'-DCMAKE_BUILD_TYPE=RelWithDebInfo'])
steps.append(['cmake',
'--build', build_path,
'--config', 'RelWithDebInfo'])

return Builder.Script(steps)
11 changes: 11 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,17 @@ jobs:
docker pull $DOCKER_IMAGE
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --compiler=gcc-${{ matrix.version }}

byo-crypto:
runs-on: ubuntu-latest
steps:
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
- name: Build ${{ env.PACKAGE_NAME }}
run: |
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }}
docker pull $DOCKER_IMAGE
docker run --env GITHUB_REF $DOCKER_IMAGE --version=${BUILDER_VERSION} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBYO_CRYPTO=ON skip_samples=1

windows-vs16:
runs-on: windows-latest
steps:
Expand Down
14 changes: 10 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ if (BUILD_DEPS)
set(BUILD_TESTING_PREV ${BUILD_TESTING})
set(BUILD_TESTING OFF)
add_subdirectory(crt/aws-crt-cpp)
add_subdirectory(crt/aws-c-iot)
if (NOT BYO_CRYPTO)
# TODO: get this working with BYO_CRYPTO
add_subdirectory(crt/aws-c-iot)
endif ()
set(BUILD_TESTING ${BUILD_TESTING_PREV})
else()
include(AwsFindPackage)
Expand All @@ -59,9 +62,12 @@ add_subdirectory(jobs)
add_subdirectory(shadow)
add_subdirectory(discovery)
add_subdirectory(identity)
add_subdirectory(iotdevicecommon)
add_subdirectory(devicedefender)
add_subdirectory(secure_tunneling)
if (NOT BYO_CRYPTO)
# TODO: get these working with BYO_CRYPTO
add_subdirectory(iotdevicecommon)
add_subdirectory(devicedefender)
add_subdirectory(secure_tunneling)
endif ()

if (BUILD_SAMPLES)
message(WARNING "BUILD_SAMPLES has been deprecated. Please build each sample separately.")
Expand Down
116 changes: 2 additions & 114 deletions builder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,121 +16,9 @@
}
}
},
"_comment": "See .builder/actions/build_samples.py for definition of 'build-samples'",
"build_steps": [
"build",
[
"mkdir",
"build_basic_pubsub"
],
[
"cmake",
"-Bbuild_basic_pubsub",
"-Hsamples/mqtt/basic_pub_sub/",
"-DCMAKE_INSTALL_PREFIX={install_dir}",
"-DCMAKE_PREFIX_PATH={install_dir}",
"-DCMAKE_BUILD_TYPE=RelWithDebInfo"
],
[
"cmake",
"--build",
"build_basic_pubsub",
"--config",
"RelWithDebInfo"
],
[
"mkdir",
"build_raw_pubsub"
],
[
"cmake",
"-Bbuild_raw_pubsub",
"-Hsamples/mqtt/raw_pub_sub/",
"-DCMAKE_INSTALL_PREFIX={install_dir}",
"-DCMAKE_PREFIX_PATH={install_dir}",
"-DCMAKE_BUILD_TYPE=RelWithDebInfo"
],
[
"cmake",
"--build",
"build_raw_pubsub",
"--config",
"RelWithDebInfo"
],
[
"mkdir",
"build_shadow"
],
[
"cmake",
"-Bbuild_shadow",
"-Hsamples/shadow/shadow_sync/",
"-DCMAKE_INSTALL_PREFIX={install_dir}",
"-DCMAKE_PREFIX_PATH={install_dir}",
"-DCMAKE_BUILD_TYPE=RelWithDebInfo"
],
[
"cmake",
"--build",
"build_shadow",
"--config",
"RelWithDebInfo"
],
[
"mkdir",
"build_greengrass"
],
[
"cmake",
"-Bbuild_greengrass",
"-Hsamples/greengrass/basic_discovery/",
"-DCMAKE_INSTALL_PREFIX={install_dir}",
"-DCMAKE_PREFIX_PATH={install_dir}",
"-DCMAKE_BUILD_TYPE=RelWithDebInfo"
],
[
"cmake",
"--build",
"build_greengrass",
"--config",
"RelWithDebInfo"
],
[
"mkdir",
"build_identity"
],
[
"cmake",
"-Bbuild_identity",
"-Hsamples/identity/fleet_provisioning/",
"-DCMAKE_INSTALL_PREFIX={install_dir}",
"-DCMAKE_PREFIX_PATH={install_dir}",
"-DCMAKE_BUILD_TYPE=RelWithDebInfo"
],
[
"cmake",
"--build",
"build_identity",
"--config",
"RelWithDebInfo"
],
[
"mkdir",
"build_jobs"
],
[
"cmake",
"-Bbuild_jobs",
"-Hsamples/jobs/describe_job_execution/",
"-DCMAKE_INSTALL_PREFIX={install_dir}",
"-DCMAKE_PREFIX_PATH={install_dir}",
"-DCMAKE_BUILD_TYPE=RelWithDebInfo"
],
[
"cmake",
"--build",
"build_jobs",
"--config",
"RelWithDebInfo"
]
"build-samples"
]
}