Skip to content

Commit a9a064c

Browse files
committed
Improving sample-app build examples
1 parent fde4da6 commit a9a064c

File tree

4 files changed

+44
-4
lines changed

4 files changed

+44
-4
lines changed

tools/scripts/build-tests/build-al2-sample-app.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ PREFIX_DIR="$1"
2525
echo "Building the Sample App"
2626

2727
mkdir "${PREFIX_DIR}/sample-build"
28+
mkdir "${PREFIX_DIR}/sample-install"
2829
cd "${PREFIX_DIR}/sample-build"
29-
cmake ../aws-sdk-cpp/tools/CI/install-test -G Ninja -DCMAKE_CXX_FLAGS="-ggdb -fsanitize=address" -DCMAKE_PREFIX_PATH="${PREFIX_DIR}/al2-install"
30-
ninja-build
30+
cmake ../aws-sdk-cpp/tools/CI/install-test -G Ninja -DCMAKE_CXX_FLAGS="-ggdb -fsanitize=address" -DCMAKE_PREFIX_PATH="${PREFIX_DIR}/al2-install" -DCMAKE_INSTALL_PREFIX="${PREFIX_DIR}/sample_install"
31+
cmake --build .
32+
cmake --build . --target install
3133

3234
if [ "${AUTORUN}" -eq 0 ]; then
3335
# Only continue if there is a scheduled autorun
@@ -44,4 +46,5 @@ aws configure set aws_session_token $(echo "$sts" | jq -r '.[2]') --profile "$pr
4446
aws configure list --profile "$profile"
4547
export AWS_PROFILE=$profile
4648
echo "Running the app"
49+
cd "${PREFIX_DIR}/sample_install"
4750
./app

tools/scripts/build-tests/build-mac-sample-app.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ echo "Building the Sample App"
2626

2727
cd aws-sdk-cpp/tools/CI/install-test
2828
mkdir "${PREFIX_DIR}/sample-build"
29+
mkdir "${PREFIX_DIR}/sample-install"
2930
cd "${PREFIX_DIR}/sample-build"
30-
cmake ../aws-sdk-cpp/tools/CI/install-test -DCMAKE_CXX_FLAGS="-ggdb -fsanitize=address" -DCMAKE_PREFIX_PATH="${PREFIX_DIR}/mac-install"
31+
cmake ../aws-sdk-cpp/tools/CI/install-test -DCMAKE_CXX_FLAGS="-ggdb -fsanitize=address" -DCMAKE_PREFIX_PATH="${PREFIX_DIR}/mac-install" -DCMAKE_INSTALL_PREFIX="${PREFIX_DIR}/sample_install"
3132
cmake --build .
33+
cmake --install .
3234

3335
if [ "${AUTORUN}" -eq 0 ]; then
3436
# Only continue if there is a scheduled autorun
@@ -46,4 +48,5 @@ aws configure set aws_session_token $(echo "$sts" | jq -r '.[2]') --profile "$pr
4648
aws configure list --profile "$profile"
4749
export AWS_PROFILE=$profile
4850
echo "Running the app"
51+
cd "${PREFIX_DIR}/sample_install"
4952
./app

tools/scripts/build-tests/build-windows-default.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
param($PREFIX_DIR)
99

1010
mkdir "${PREFIX_DIR}/win-build"
11+
mkdir "${PREFIX_DIR}/win-install"
1112
cd "${PREFIX_DIR}/win-build"
12-
&'C:\\Program Files\\CMake\\bin\\cmake.exe' ../aws-sdk-cpp
13+
&'C:\\Program Files\\CMake\\bin\\cmake.exe' ../aws-sdk-cpp -DCMAKE_INSTALL_PREFIX="${PREFIX_DIR}/win-install"
1314
&'C:\\Program Files\\CMake\\bin\\cmake.exe' --build . -j 8
15+
&'C:\\Program Files\\CMake\\bin\\cmake.exe' --build . --target install
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/bin/bash
2+
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
# SPDX-License-Identifier: Apache-2.0.
4+
5+
# This script builds a sample app
6+
# Directories created and files are prefixed with PREFIX_DIR argument
7+
# SDK installation is expected to be in ${PREFIX_DIR}/mac-install and a clone of aws-sdk-cpp is expected to be in ${PREFIX_DIR}/aws-sdk-cpp
8+
# A AWS_ACCOUNT with proper role setup is required to run the built app, if passed argument, app is tried to run after build
9+
# Platform: Windows
10+
11+
param($PREFIX_DIR)
12+
13+
cd "${PREFIX_DIR}/aws-sdk-cpp/tools/CI/install-test"
14+
mkdir "${PREFIX_DIR}/sample-build"
15+
mkdir "${PREFIX_DIR}/sample-install"
16+
cd "${PREFIX_DIR}/sample-build"
17+
&'C:\\Program Files\\CMake\\bin\\cmake.exe' ../aws-sdk-cpp/tools/CI/install-test -DCMAKE_CXX_FLAGS="-ggdb -fsanitize=address" -DCMAKE_PREFIX_PATH="${PREFIX_DIR}/win-install" -DCMAKE_INSTALL_PREFIX="${PREFIX_DIR}/sample_install"
18+
&'C:\\Program Files\\CMake\\bin\\cmake.exe' --build .
19+
&'C:\\Program Files\\CMake\\bin\\cmake.exe' --build . --target install
20+
21+
echo "Setting the run environment"
22+
$TEST_ASSUME_ROLE_ARN = "arn:aws:iam::${env:AWS_ACCOUNT}:role/IntegrationTest"
23+
${env:TEST_LAMBDA_CODE_PATH} = "${env:PREFIX_DIR}/aws-sdk-cpp/tests/aws-cpp-sdk-lambda-integration-tests/resources"
24+
$sts = aws sts assume-role --role-arn "${TEST_ASSUME_ROLE_ARN}" --role-session-name "${env:AWS_ROLE_SESSION_NAME}" --query "Credentials.[AccessKeyId, SecretAccessKey, SessionToken]"
25+
$sts
26+
aws configure set aws_access_key_id (${sts}[1] -replace " " -replace "`"" -replace ",")
27+
aws configure set aws_secret_access_key (${sts}[2] -replace " " -replace "`"" -replace ",")
28+
aws configure set aws_session_token (${sts}[3] -replace " " -replace "`"" -replace ",")
29+
aws configure list
30+
# Run tests
31+
cd "${PREFIX_DIR}/sample_install"
32+
app

0 commit comments

Comments
 (0)