diff --git a/builder.json b/builder.json index 1d38416..79c8c91 100644 --- a/builder.json +++ b/builder.json @@ -1,12 +1,12 @@ { "name": "aws-crt-dotnet", "build_steps": [ - "dotnet build -f netstandard2.0 -p:AwsCrtPlatformTarget={aws_crt_platform_target}", - "dotnet pack -p:TargetFrameworks=netstandard2.0 -p:AwsCrtPlatformTarget={aws_crt_platform_target}" + "dotnet build -f netstandard2.0 -p:AwsCrtPlatformTarget={aws_crt_platform_target} --configuration Debug", + "dotnet pack -p:TargetFrameworks=netstandard2.0 -p:AwsCrtPlatformTarget={aws_crt_platform_target} --configuration Debug" ], "test_steps": [ - "dotnet build tests/tests.csproj {build_tests_args}", - "dotnet test tests --no-build {run_tests_args}" + "dotnet build tests/tests.csproj {build_tests_args} --configuration Debug", + "dotnet test tests --no-build {run_tests_args} --configuration Debug" ], "imports": [ "dotnetcore" @@ -90,7 +90,7 @@ "variants": { "mono_test" : { "!test_steps": [ - "dotnet build tests/tests.csproj -t:MonoTest {build_tests_args}" + "dotnet build tests/tests.csproj -t:MonoTest {build_tests_args} --configuration Debug" ] } } diff --git a/clean_rebuild.sh b/clean_rebuild.sh index b79f37c..04dbff5 100755 --- a/clean_rebuild.sh +++ b/clean_rebuild.sh @@ -19,5 +19,5 @@ rm -rf tests/obj rm -rf tools/Elasticurl/bin rm -rf tools/Elasticurl/ob -dotnet build -f netstandard2.0 -p:PlatformTarget=x64 -p:CMakeConfig=Debug -dotnet pack -p:TargetFrameworks=netstandard2.0 +dotnet build -f netstandard2.0 -p:PlatformTarget=x64 -p:CMakeConfig=Debug --configuration Debug +dotnet pack -p:TargetFrameworks=netstandard2.0 --configuration Debug diff --git a/codebuild/common-posix.sh b/codebuild/common-posix.sh deleted file mode 100755 index e2bb41e..0000000 --- a/codebuild/common-posix.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -set -ex - -# packages dir needs to exist -mkdir -p packages -# test will build and package, then run tests -dotnet build -v normal -dotnet test tests -v normal - -if [ "$AWS_DOTNET_RUNTIME" == "" ]; then - exit 0 -fi - -dotnet publish --self-contained --runtime $AWS_DOTNET_RUNTIME tools/Elasticurl - -curl -L -o /tmp/http_client_test.py https://raw.githubusercontent.com/awslabs/aws-c-http/main/integration-testing/http_client_test.py -python3 /tmp/http_client_test.py tools/Elasticurl/bin/Debug/netcoreapp2.1/$AWS_DOTNET_RUNTIME/publish/Elasticurl.NET diff --git a/codebuild/linux-clang3-x64.yml b/codebuild/linux-clang3-x64.yml deleted file mode 100644 index 3de7506..0000000 --- a/codebuild/linux-clang3-x64.yml +++ /dev/null @@ -1,26 +0,0 @@ -version: 0.2 -#this buildspec assumes the ubuntu 14.04 trusty image -phases: - install: - commands: - - sudo apt-get update -y - - sudo apt-get install clang-3.9 cmake3 dpkg python3 -y - # .NET Core install instructions taken from: https://dotnet.microsoft.com/download/linux-package-manager/ubuntu14-04/sdk-current - - curl -L https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb --output /tmp/packages-microsoft-prod.deb - - sudo dpkg -i /tmp/packages-microsoft-prod.deb - - sudo apt-get install apt-transport-https - - sudo apt-get update -y - - sudo apt-get install dotnet-sdk-2.2 -y - - pre_build: - commands: - - export CC=clang-3.9 - - export AWS_DOTNET_RUNTIME=linux-x64 - build: - commands: - - echo Build started on `date` - - ./codebuild/common-posix.sh - post_build: - commands: - - echo Build completed on `date` - diff --git a/codebuild/linux-clang6-x64.yml b/codebuild/linux-clang6-x64.yml deleted file mode 100644 index 74bd4bf..0000000 --- a/codebuild/linux-clang6-x64.yml +++ /dev/null @@ -1,29 +0,0 @@ -version: 0.2 -#this buildspec assumes the ubuntu 14.04 trusty image -phases: - install: - commands: - - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - - sudo add-apt-repository ppa:ubuntu-toolchain-r/test - - sudo apt-add-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-6.0 main" - - sudo apt-get update -y - - sudo apt-get install clang-6.0 cmake3 dpkg python3 -y -f - # .NET Core install instructions taken from: https://dotnet.microsoft.com/download/linux-package-manager/ubuntu14-04/sdk-current - - curl -L https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb --output /tmp/packages-microsoft-prod.deb - - sudo dpkg -i /tmp/packages-microsoft-prod.deb - - sudo apt-get install apt-transport-https - - sudo apt-get update -y - - sudo apt-get install dotnet-sdk-2.2 -y - - pre_build: - commands: - - export CC=clang-6.0 - - export AWS_DOTNET_RUNTIME=linux-x64 - build: - commands: - - echo Build started on `date` - - ./codebuild/common-posix.sh - post_build: - commands: - - echo Build completed on `date` - diff --git a/codebuild/linux-clang8-x64.yml b/codebuild/linux-clang8-x64.yml deleted file mode 100644 index 8ad136e..0000000 --- a/codebuild/linux-clang8-x64.yml +++ /dev/null @@ -1,33 +0,0 @@ -version: 0.2 -#this buildspec assumes the ubuntu 14.04 trusty image -phases: - install: - commands: - - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - - sudo add-apt-repository ppa:ubuntu-toolchain-r/test - - sudo apt-add-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-8 main" - - sudo apt-get update -y - - sudo apt-get install clang-8 cmake3 clang-tidy-8 clang-format-8 dpkg python3 -y -f - # .NET Core install instructions taken from: https://dotnet.microsoft.com/download/linux-package-manager/ubuntu14-04/sdk-current - - curl -L https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb --output /tmp/packages-microsoft-prod.deb - - sudo dpkg -i /tmp/packages-microsoft-prod.deb - - sudo apt-get install apt-transport-https - - sudo apt-get update -y - - sudo apt-get install dotnet-sdk-2.2 -y - - pre_build: - commands: - - export CC=clang-8 - - export CXX=clang++-8 - - export CLANG_FORMAT=clang-format-8 - - export AWS_DOTNET_RUNTIME=linux-x64 - build: - commands: - - echo Build started on `date` - - ./codebuild/common-posix.sh - - clang-tidy-8 -p=$CODEBUILD_SRC_DIR/build $CODEBUILD_SRC_DIR/native/src/*.c - - ./codebuild/format-check.sh - post_build: - commands: - - echo Build completed on `date` - diff --git a/codebuild/linux-gcc-4x-x64.yml b/codebuild/linux-gcc-4x-x64.yml deleted file mode 100644 index 3c94650..0000000 --- a/codebuild/linux-gcc-4x-x64.yml +++ /dev/null @@ -1,26 +0,0 @@ -version: 0.2 -#this build spec assumes the ubuntu 14.04 trusty image -phases: - install: - commands: - - sudo apt-get update -y - - sudo apt-get install gcc g++ cmake3 dpkg python3 -y - # .NET Core install instructions taken from: https://dotnet.microsoft.com/download/linux-package-manager/ubuntu14-04/sdk-current - - curl -L https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb --output /tmp/packages-microsoft-prod.deb - - sudo dpkg -i /tmp/packages-microsoft-prod.deb - - sudo apt-get install apt-transport-https - - sudo apt-get update -y - - sudo apt-get install dotnet-sdk-2.2 -y - pre_build: - commands: - - export CC=gcc - - export CXX=g++ - - export AWS_DOTNET_RUNTIME=linux-x64 - build: - commands: - - echo Build started on `date` - - ./codebuild/common-posix.sh - post_build: - commands: - - echo Build completed on `date` - diff --git a/codebuild/linux-gcc-5x-x64.yml b/codebuild/linux-gcc-5x-x64.yml deleted file mode 100644 index be2b259..0000000 --- a/codebuild/linux-gcc-5x-x64.yml +++ /dev/null @@ -1,26 +0,0 @@ -version: 0.2 -#this build spec assumes the ubuntu 14.04 trusty image -phases: - install: - commands: - - sudo add-apt-repository ppa:ubuntu-toolchain-r/test - - sudo apt-get update -y - - sudo apt-get install gcc-5 cmake3 dpkg python3 -y - # .NET Core install instructions taken from: https://dotnet.microsoft.com/download/linux-package-manager/ubuntu14-04/sdk-current - - curl -L https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb --output /tmp/packages-microsoft-prod.deb - - sudo dpkg -i /tmp/packages-microsoft-prod.deb - - sudo apt-get install apt-transport-https - - sudo apt-get update -y - - sudo apt-get install dotnet-sdk-2.2 -y - pre_build: - commands: - - export CC=gcc-5 - - export AWS_DOTNET_RUNTIME=linux-x64 - build: - commands: - - echo Build started on `date` - - ./codebuild/common-posix.sh - post_build: - commands: - - echo Build completed on `date` - diff --git a/codebuild/linux-gcc-6x-x64.yml b/codebuild/linux-gcc-6x-x64.yml deleted file mode 100644 index 863f798..0000000 --- a/codebuild/linux-gcc-6x-x64.yml +++ /dev/null @@ -1,26 +0,0 @@ -version: 0.2 -#this build spec assumes the ubuntu 14.04 trusty image -phases: - install: - commands: - - sudo add-apt-repository ppa:ubuntu-toolchain-r/test - - sudo apt-get update -y - - sudo apt-get install gcc-6 cmake3 dpkg python3 -y - # .NET Core install instructions taken from: https://dotnet.microsoft.com/download/linux-package-manager/ubuntu14-04/sdk-current - - curl -L https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb --output /tmp/packages-microsoft-prod.deb - - sudo dpkg -i /tmp/packages-microsoft-prod.deb - - sudo apt-get install apt-transport-https - - sudo apt-get update -y - - sudo apt-get install dotnet-sdk-2.2 -y - pre_build: - commands: - - export CC=gcc-6 - - export AWS_DOTNET_RUNTIME=linux-x64 - build: - commands: - - echo Build started on `date` - - ./codebuild/common-posix.sh - post_build: - commands: - - echo Build completed on `date` - diff --git a/codebuild/linux-gcc-7x-x64.yml b/codebuild/linux-gcc-7x-x64.yml deleted file mode 100644 index 0eb487f..0000000 --- a/codebuild/linux-gcc-7x-x64.yml +++ /dev/null @@ -1,26 +0,0 @@ -version: 0.2 -#this build spec assumes the ubuntu 14.04 trusty image -phases: - install: - commands: - - sudo add-apt-repository ppa:ubuntu-toolchain-r/test - - sudo apt-get update -y - - sudo apt-get install gcc-7 cmake3 dpkg python3 -y - # .NET Core install instructions taken from: https://dotnet.microsoft.com/download/linux-package-manager/ubuntu14-04/sdk-current - - curl -L https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb --output /tmp/packages-microsoft-prod.deb - - sudo dpkg -i /tmp/packages-microsoft-prod.deb - - sudo apt-get install apt-transport-https - - sudo apt-get update -y - - sudo apt-get install dotnet-sdk-2.2 -y - pre_build: - commands: - - export CC=gcc-7 - - export AWS_DOTNET_RUNTIME=linux-x64 - build: - commands: - - echo Build started on `date` - - ./codebuild/common-posix.sh - post_build: - commands: - - echo Build completed on `date` - diff --git a/codebuild/windows-msvc-2015-x86.yml b/codebuild/windows-msvc-2015-x86.yml deleted file mode 100644 index d572b83..0000000 --- a/codebuild/windows-msvc-2015-x86.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: 0.2 - -phases: - install: - commands: - - .\codebuild\install-dotnet.bat https://download.visualstudio.microsoft.com/download/pr/df174ab6-0fcd-47cd-bc95-6a0e09e8f71b/fc7101af6ac2cdac1e0a09075490fd45/dotnet-sdk-2.2.203-win-x86.exe - build: - commands: - - .\codebuild\common-windows.bat -p:CMakeGenerator="Visual Studio 14 2015" - diff --git a/codebuild/windows-msvc-2015.yml b/codebuild/windows-msvc-2015.yml deleted file mode 100644 index 8592158..0000000 --- a/codebuild/windows-msvc-2015.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: 0.2 - -phases: - # download and install dotnet SDK 2.2 - install: - commands: - - .\codebuild\install-dotnet.bat https://download.visualstudio.microsoft.com/download/pr/3c43f486-2799-4454-851c-fa7a9fb73633/673099a9fe6f1cac62dd68da37ddbc1a/dotnet-sdk-2.2.203-win-x64.exe - build: - commands: - - .\codebuild\common-windows.bat -p:CMakeGenerator="Visual Studio 14 2015 Win64" - diff --git a/codebuild/windows-msvc-2017.yml b/codebuild/windows-msvc-2017.yml deleted file mode 100644 index 9268c8e..0000000 --- a/codebuild/windows-msvc-2017.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: 0.2 - -phases: - # download and install dotnet SDK 2.2 - install: - commands: - - .\codebuild\install-dotnet.bat https://download.visualstudio.microsoft.com/download/pr/3c43f486-2799-4454-851c-fa7a9fb73633/673099a9fe6f1cac62dd68da37ddbc1a/dotnet-sdk-2.2.203-win-x64.exe - build: - commands: - - .\codebuild\common-windows.bat -p:CMakeGenerator="Visual Studio 15 2017 Win64" -