From b4a6ce6c34d2e8cad711aeabe69924f2dffa281a Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 14:00:17 -0800 Subject: [PATCH 01/36] test change --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 16ff50b..cb34588 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: - '!main' env: - BUILDER_VERSION: v0.9.17 + BUILDER_VERSION: v0.9.18 BUILDER_SOURCE: releases BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net PACKAGE_NAME: aws-crt-dotnet @@ -68,7 +68,7 @@ jobs: ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }} --spec downstream linux_mono: - runs-on: ubuntu-20.04 + runs-on: ubuntu-20.04 steps: - name: Build ${{ env.PACKAGE_NAME }} run: | From 3dcf78b0c1263054ec71332cf26e3719eea262f8 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 14:49:38 -0800 Subject: [PATCH 02/36] use dot version --- .github/workflows/ci.yml | 203 ++++++++++++++++++++------------------- 1 file changed, 103 insertions(+), 100 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb34588..3387ca3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,91 +18,91 @@ env: AWS_REGION: us-east-1 jobs: - linux-compat: - runs-on: ubuntu-20.04 - strategy: - matrix: - image: - - al2-x64 - steps: - - name: Build ${{ env.PACKAGE_NAME }} + consumers - run: | - aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh - ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} --spec=downstream + # linux-compat: + # runs-on: ubuntu-20.04 + # strategy: + # matrix: + # image: + # - al2-x64 + # steps: + # - name: Build ${{ env.PACKAGE_NAME }} + consumers + # run: | + # aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh + # ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} --spec=downstream - linux-arm: - runs-on: ubuntu-20.04 - strategy: - matrix: - arch: [arm64] - steps: - - name: Install qemu/docker - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages - - name: Build ${{ env.PACKAGE_NAME }} + consumers - run: | - aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh - ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-ubuntu-20-aarch64 build -p ${{ env.PACKAGE_NAME }} --target=linux-${{ matrix.arch }} + # linux-arm: + # runs-on: ubuntu-20.04 + # strategy: + # matrix: + # arch: [arm64] + # steps: + # - name: Install qemu/docker + # run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + # # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages + # - name: Build ${{ env.PACKAGE_NAME }} + consumers + # run: | + # aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh + # ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-ubuntu-20-aarch64 build -p ${{ env.PACKAGE_NAME }} --target=linux-${{ matrix.arch }} - linux-compiler-compat: - runs-on: ubuntu-latest - strategy: - matrix: - compiler: - - clang-3 - - clang-6 - - clang-8 - - clang-9 - - clang-10 - - clang-11 - - gcc-4.8 - - gcc-5 - - gcc-6 - - gcc-7 - - gcc-8 - steps: - # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages - - name: Build ${{ env.PACKAGE_NAME }} - run: | - aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh - ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }} --spec downstream + # linux-compiler-compat: + # runs-on: ubuntu-latest + # strategy: + # matrix: + # compiler: + # - clang-3 + # - clang-6 + # - clang-8 + # - clang-9 + # - clang-10 + # - clang-11 + # - gcc-4.8 + # - gcc-5 + # - gcc-6 + # - gcc-7 + # - gcc-8 + # steps: + # # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages + # - name: Build ${{ env.PACKAGE_NAME }} + # run: | + # aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh + # ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }} --spec downstream - linux_mono: - runs-on: ubuntu-20.04 - steps: - - name: Build ${{ env.PACKAGE_NAME }} - run: | - python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')" - chmod a+x builder - ./builder build -p ${{ env.PACKAGE_NAME }} --variant=mono_test + # linux_mono: + # runs-on: ubuntu-20.04 + # steps: + # - name: Build ${{ env.PACKAGE_NAME }} + # run: | + # python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')" + # chmod a+x builder + # ./builder build -p ${{ env.PACKAGE_NAME }} --variant=mono_test - clang-sanitizers: - runs-on: ubuntu-20.04 - strategy: - matrix: - sanitizers: [",thread", ",address,undefined"] - steps: - # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages - - name: Build ${{ env.PACKAGE_NAME }} - run: | - aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh - ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=clang-11 --cmake-extra=-DENABLE_SANITIZERS=ON --cmake-extra=-DSANITIZERS="${{ matrix.sanitizers }}" + # clang-sanitizers: + # runs-on: ubuntu-20.04 + # strategy: + # matrix: + # sanitizers: [",thread", ",address,undefined"] + # steps: + # # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages + # - name: Build ${{ env.PACKAGE_NAME }} + # run: | + # aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh + # ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=clang-11 --cmake-extra=-DENABLE_SANITIZERS=ON --cmake-extra=-DSANITIZERS="${{ matrix.sanitizers }}" - windows-vc16: - runs-on: windows-2019 - strategy: - matrix: - arch: [x64] - steps: - - uses: ilammy/msvc-dev-cmd@v1 - with: - arch: ${{ matrix.arch }} - uwp: false - spectre: true - - name: Build ${{ env.PACKAGE_NAME }} + consumers - run: | - python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" - python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream + # windows-vc16: + # runs-on: windows-2019 + # strategy: + # matrix: + # arch: [x64] + # steps: + # - uses: ilammy/msvc-dev-cmd@v1 + # with: + # arch: ${{ matrix.arch }} + # uwp: false + # spectre: true + # - name: Build ${{ env.PACKAGE_NAME }} + consumers + # run: | + # python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" + # python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream windows-vc14: runs-on: windows-2019 @@ -111,7 +111,10 @@ jobs: arch: [x86, x64] steps: - uses: ilammy/msvc-dev-cmd@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-dotnet@v3 with: + dotnet-version: 5.0 toolset: 14.0 arch: ${{ matrix.arch }} uwp: false @@ -121,27 +124,27 @@ jobs: python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-14 downstream - osx: - runs-on: macos-11 - steps: - - name: Build ${{ env.PACKAGE_NAME }} + consumers - run: | - python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')" - chmod a+x builder - ./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream + # osx: + # runs-on: macos-11 + # steps: + # - name: Build ${{ env.PACKAGE_NAME }} + consumers + # run: | + # python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')" + # chmod a+x builder + # ./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream - # cross-compile for Apple silicon - # it would be better to run tests natively on one of these machines, - # but we don't have access to one in the cloud, so for now just cross-compile - osx-arm64-cross-compile: - runs-on: macos-11 - steps: - - name: Build ${{ env.PACKAGE_NAME }} + consumers - run: | - python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')" - chmod a+x builder - ./builder build -p ${{ env.PACKAGE_NAME }} --target macos-arm64 run_tests=false - test `lipo aws-crt-dotnet/build/Arm64/lib/libaws-crt-dotnet-ARM64.dylib -archs` = "arm64" + # # cross-compile for Apple silicon + # # it would be better to run tests natively on one of these machines, + # # but we don't have access to one in the cloud, so for now just cross-compile + # osx-arm64-cross-compile: + # runs-on: macos-11 + # steps: + # - name: Build ${{ env.PACKAGE_NAME }} + consumers + # run: | + # python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')" + # chmod a+x builder + # ./builder build -p ${{ env.PACKAGE_NAME }} --target macos-arm64 run_tests=false + # test `lipo aws-crt-dotnet/build/Arm64/lib/libaws-crt-dotnet-ARM64.dylib -archs` = "arm64" check-submodules: runs-on: ubuntu-20.04 From ab91d28b70b7b08ba531a9f713ead0d53a216f0a Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 14:53:36 -0800 Subject: [PATCH 03/36] fix uses --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3387ca3..e733701 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,11 +110,12 @@ jobs: matrix: arch: [x86, x64] steps: - - uses: ilammy/msvc-dev-cmd@v1 - uses: actions/checkout@v3 - uses: actions/setup-dotnet@v3 with: dotnet-version: 5.0 + - uses: ilammy/msvc-dev-cmd@v1 + with: toolset: 14.0 arch: ${{ matrix.arch }} uwp: false From 565f33ca253197db1f104c7b64428aaf0d7b4549 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 14:58:53 -0800 Subject: [PATCH 04/36] separate CI --- .github/workflows/ci.yml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e733701..b830c28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,7 +108,28 @@ jobs: runs-on: windows-2019 strategy: matrix: - arch: [x86, x64] + arch: [x64] + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-dotnet@v3 + with: + dotnet-version: 5.0 + - uses: ilammy/msvc-dev-cmd@v1 + with: + toolset: 14.0 + arch: ${{ matrix.arch }} + uwp: false + spectre: true + - name: Build ${{ env.PACKAGE_NAME }} + consumers + run: | + python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" + python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-14 downstream + + windows-vc14-x86: + runs-on: windows-2019 + strategy: + matrix: + arch: [x86] steps: - uses: actions/checkout@v3 - uses: actions/setup-dotnet@v3 From ad641c677255bd084f28800edda01ed5d6d29d32 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 15:03:50 -0800 Subject: [PATCH 05/36] test another action --- .github/workflows/ci.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b830c28..3d15edb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,11 +110,7 @@ jobs: matrix: arch: [x64] steps: - - uses: actions/checkout@v3 - - uses: actions/setup-dotnet@v3 - with: - dotnet-version: 5.0 - - uses: ilammy/msvc-dev-cmd@v1 + - uses: TheMrMilchmann/setup-msvc-dev@v2 with: toolset: 14.0 arch: ${{ matrix.arch }} @@ -131,11 +127,7 @@ jobs: matrix: arch: [x86] steps: - - uses: actions/checkout@v3 - - uses: actions/setup-dotnet@v3 - with: - dotnet-version: 5.0 - - uses: ilammy/msvc-dev-cmd@v1 + - uses: TheMrMilchmann/setup-msvc-dev@v2 with: toolset: 14.0 arch: ${{ matrix.arch }} From 69d34b76b3e8c7c11cc12567851b35eed07d7d0b Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 15:07:19 -0800 Subject: [PATCH 06/36] reset --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d15edb..7537187 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,7 +110,8 @@ jobs: matrix: arch: [x64] steps: - - uses: TheMrMilchmann/setup-msvc-dev@v2 + + - uses: ilammy/msvc-dev-cmd@v1 with: toolset: 14.0 arch: ${{ matrix.arch }} @@ -127,7 +128,7 @@ jobs: matrix: arch: [x86] steps: - - uses: TheMrMilchmann/setup-msvc-dev@v2 + - uses: ilammy/msvc-dev-cmd@v1 with: toolset: 14.0 arch: ${{ matrix.arch }} @@ -136,7 +137,7 @@ jobs: - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" - python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-14 downstream + python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} # osx: # runs-on: macos-11 From ecfb4907560bd61eb6bf3852457ff099f4ad5d8c Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 15:26:33 -0800 Subject: [PATCH 07/36] update --- .github/workflows/ci.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7537187..e699253 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,7 +110,10 @@ jobs: matrix: arch: [x64] steps: - + - uses: actions/checkout@v3 + - uses: actions/setup-dotnet@v3 + with: + dotnet-version: 5.0 - uses: ilammy/msvc-dev-cmd@v1 with: toolset: 14.0 @@ -122,12 +125,18 @@ jobs: python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-14 downstream - windows-vc14-x86: +windows-vc14-x86: runs-on: windows-2019 strategy: matrix: arch: [x86] steps: + - uses: actions/checkout@v3 + - uses: actions/setup-dotnet@v3 + with: + dotnet-version: | + 5.0 + 6.0 - uses: ilammy/msvc-dev-cmd@v1 with: toolset: 14.0 @@ -137,7 +146,7 @@ jobs: - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" - python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} + python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-14 downstream # osx: # runs-on: macos-11 From 85e87061bd5141bb1634c39799e41da7079e807d Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 17:29:32 -0800 Subject: [PATCH 08/36] test --- .github/workflows/ci.yml | 30 ++++++++++++++-------------- builder.json | 42 ++++++++++++++++++++-------------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e699253..6226f7a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -135,8 +135,9 @@ windows-vc14-x86: - uses: actions/setup-dotnet@v3 with: dotnet-version: | - 5.0 - 6.0 + 3.1.x + 5.0.x + 6.0.x - uses: ilammy/msvc-dev-cmd@v1 with: toolset: 14.0 @@ -147,7 +148,6 @@ windows-vc14-x86: run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-14 downstream - # osx: # runs-on: macos-11 # steps: @@ -170,15 +170,15 @@ windows-vc14-x86: # ./builder build -p ${{ env.PACKAGE_NAME }} --target macos-arm64 run_tests=false # test `lipo aws-crt-dotnet/build/Arm64/lib/libaws-crt-dotnet-ARM64.dylib -archs` = "arm64" - check-submodules: - runs-on: ubuntu-20.04 - steps: - - name: Checkout Source - uses: actions/checkout@v3 - with: - submodules: true - fetch-depth: 0 - - name: Check Submodules - # note: using "@main" because "@${{env.BUILDER_VERSION}}" doesn't work - # https://github.com/actions/runner/issues/480 - uses: awslabs/aws-crt-builder/.github/actions/check-submodules@main + # check-submodules: + # runs-on: ubuntu-20.04 + # steps: + # - name: Checkout Source + # uses: actions/checkout@v3 + # with: + # submodules: true + # fetch-depth: 0 + # - name: Check Submodules + # # note: using "@main" because "@${{env.BUILDER_VERSION}}" doesn't work + # # https://github.com/actions/runner/issues/480 + # uses: awslabs/aws-crt-builder/.github/actions/check-submodules@main diff --git a/builder.json b/builder.json index e9cd42e..8ca94b4 100644 --- a/builder.json +++ b/builder.json @@ -5,6 +5,7 @@ "dotnet pack -p:TargetFrameworks=netstandard2.0 -p:AwsCrtPlatformTarget={aws_crt_platform_target}" ], "test_steps": [ + "dotnet --version", "dotnet build tests/tests.csproj {build_tests_args}", "dotnet test tests --no-build {run_tests_args}" ], @@ -31,9 +32,9 @@ "AWS_DOTNET_RUNTIME": "linux-x64" }, "variables": { - "build_tests_args" : "", - "run_tests_args" : "", - "aws_crt_platform_target" : "x64" + "build_tests_args": "", + "run_tests_args": "", + "aws_crt_platform_target": "x64" } }, "arm64": { @@ -41,9 +42,9 @@ "AWS_DOTNET_RUNTIME": "linux-arm64" }, "variables": { - "run_tests_args" : "--runtime linux-arm64 -p:PlatformTarget=Arm -p:Platform=Arm", + "run_tests_args": "--runtime linux-arm64 -p:PlatformTarget=Arm -p:Platform=Arm", "build_tests_args": "-p:AwsCrtPlatformTarget=Arm64 -p:Platform=Arm64 -p:PlatformTarget=Arm64 --runtime linux-arm64 && mv tests/bin/Arm64 tests/bin/Arm", - "aws_crt_platform_target" : "arm64" + "aws_crt_platform_target": "arm64" } } } @@ -52,45 +53,44 @@ "architectures": { "x86": { "variables": { - "build_tests_args" : "", - "run_tests_args" : "", - "aws_crt_platform_target" : "x86" + "build_tests_args": "", + "run_tests_args": "", + "aws_crt_platform_target": "x86" } }, "x64": { "variables": { - "build_tests_args" : "", - "run_tests_args" : "", - "aws_crt_platform_target" : "x64" + "build_tests_args": "", + "run_tests_args": "", + "aws_crt_platform_target": "x64" } } } }, - "macos" :{ + "macos": { "architectures": { "x64": { "variables": { - "build_tests_args" : "", - "run_tests_args" : "", - "aws_crt_platform_target" : "x64" + "build_tests_args": "", + "run_tests_args": "", + "aws_crt_platform_target": "x64" } }, "arm64": { "variables": { - "build_tests_args" : "", - "run_tests_args" : "", - "aws_crt_platform_target" : "Arm64" + "build_tests_args": "", + "run_tests_args": "", + "aws_crt_platform_target": "Arm64" } } } } }, - "variants": { - "mono_test" : { + "mono_test": { "!test_steps": [ "dotnet build tests/tests.csproj -t:MonoTest {build_tests_args}" ] } } -} +} \ No newline at end of file From 1d726048c9a4e85b5af4e6ddf27aaa93563358a1 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 17:30:29 -0800 Subject: [PATCH 09/36] fix tab --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6226f7a..9ae0152 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -125,7 +125,7 @@ jobs: python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-14 downstream -windows-vc14-x86: + windows-vc14-x86: runs-on: windows-2019 strategy: matrix: From 6af507a2976d00424be68ff937759726ed6a0ba4 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 17:37:21 -0800 Subject: [PATCH 10/36] remove checkout --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ae0152..6b5aaff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,7 +110,6 @@ jobs: matrix: arch: [x64] steps: - - uses: actions/checkout@v3 - uses: actions/setup-dotnet@v3 with: dotnet-version: 5.0 @@ -131,7 +130,6 @@ jobs: matrix: arch: [x86] steps: - - uses: actions/checkout@v3 - uses: actions/setup-dotnet@v3 with: dotnet-version: | From 8b2452fcb4442662cfb10990a716cf8f99beda1f Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 17:45:58 -0800 Subject: [PATCH 11/36] remove dev cmd --- .github/workflows/ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b5aaff..8e759d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -135,13 +135,6 @@ jobs: dotnet-version: | 3.1.x 5.0.x - 6.0.x - - uses: ilammy/msvc-dev-cmd@v1 - with: - toolset: 14.0 - arch: ${{ matrix.arch }} - uwp: false - spectre: true - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" From e5ee196ae6f2d050e72f113726660d9b19019352 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 17:50:37 -0800 Subject: [PATCH 12/36] add vs version --- .github/workflows/ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e759d4..c8e8de7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,11 +130,13 @@ jobs: matrix: arch: [x86] steps: - - uses: actions/setup-dotnet@v3 + - uses: ilammy/msvc-dev-cmd@v1 with: - dotnet-version: | - 3.1.x - 5.0.x + toolset: 14.0 + arch: ${{ matrix.arch }} + uwp: false + spectre: true + vsversion: 2019 - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" From 8b7f5ff4d04f0034bd8258a69abc3e1e32f45f2a Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 18:01:15 -0800 Subject: [PATCH 13/36] add global json --- global.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 global.json diff --git a/global.json b/global.json new file mode 100644 index 0000000..bb4954b --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "5.0.408" + } +} \ No newline at end of file From 270e7dfd3ceb43071f5c75a6aea808c400153744 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 18:21:45 -0800 Subject: [PATCH 14/36] use vs 2015 --- .github/workflows/ci.yml | 2 +- global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c8e8de7..03066d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -136,7 +136,7 @@ jobs: arch: ${{ matrix.arch }} uwp: false spectre: true - vsversion: 2019 + vsversion: 2015 - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" diff --git a/global.json b/global.json index bb4954b..3515c48 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "5.0.408" + "version": "6.0" } } \ No newline at end of file From 7d806d9f775f000b04f457f1716ad699174bb09e Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 18:27:20 -0800 Subject: [PATCH 15/36] add net5.0 --- .github/workflows/ci.yml | 12 +++++++++++- tests/tests.csproj | 3 ++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03066d6..48b7359 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -129,14 +129,24 @@ jobs: strategy: matrix: arch: [x86] + steps: + - name: Checkout Source + uses: actions/checkout@v3 + with: + submodules: true + fetch-depth: 0 + - uses: actions/setup-dotnet@v3 + with: + dotnet-version: | + 3.1.x + 5.0.x - uses: ilammy/msvc-dev-cmd@v1 with: toolset: 14.0 arch: ${{ matrix.arch }} uwp: false spectre: true - vsversion: 2015 - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" diff --git a/tests/tests.csproj b/tests/tests.csproj index 7c7ad9f..70c3104 100644 --- a/tests/tests.csproj +++ b/tests/tests.csproj @@ -1,6 +1,7 @@ + x86 x64 false @@ -17,7 +18,7 @@ Disable net5.0 for x86 for now and migrate to 6.0 (5.0 is eol)/fix dep script. --> - netcoreapp3.1 + netcoreapp3.1;net5.0 From 46bd98374220c7b45f529fad7143bff052ebfa0a Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 18:33:17 -0800 Subject: [PATCH 16/36] remove tests --- builder.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/builder.json b/builder.json index 8ca94b4..f45e277 100644 --- a/builder.json +++ b/builder.json @@ -56,7 +56,10 @@ "build_tests_args": "", "run_tests_args": "", "aws_crt_platform_target": "x86" - } + }, + "!test_steps": [ + "dotnet --version" + ] }, "x64": { "variables": { From 1a5864082aa1a6e55748e355e3952d1b94f23916 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 18:41:41 -0800 Subject: [PATCH 17/36] force version 5.0 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 3515c48..d0d189a 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0" + "version": "5.0" } } \ No newline at end of file From 7dfa2d66dac538b991ec47e26ae6942e59653387 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 18:49:14 -0800 Subject: [PATCH 18/36] remove args --- builder.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builder.json b/builder.json index f45e277..3728ebd 100644 --- a/builder.json +++ b/builder.json @@ -6,8 +6,8 @@ ], "test_steps": [ "dotnet --version", - "dotnet build tests/tests.csproj {build_tests_args}", - "dotnet test tests --no-build {run_tests_args}" + "dotnet build tests/tests.csproj", + "dotnet test tests --no-build" ], "imports": [ "dotnetcore" From c9827ac5d24e833384295661e3ffacb9cae1f475 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 18:55:34 -0800 Subject: [PATCH 19/36] update version --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index d0d189a..bb4954b 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "5.0" + "version": "5.0.408" } } \ No newline at end of file From fefca3f8a2b2bbe32ed82ea148b20a2a7049cfd1 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Tue, 24 Jan 2023 20:36:02 -0800 Subject: [PATCH 20/36] include tests --- builder.json | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/builder.json b/builder.json index 3728ebd..8ca94b4 100644 --- a/builder.json +++ b/builder.json @@ -6,8 +6,8 @@ ], "test_steps": [ "dotnet --version", - "dotnet build tests/tests.csproj", - "dotnet test tests --no-build" + "dotnet build tests/tests.csproj {build_tests_args}", + "dotnet test tests --no-build {run_tests_args}" ], "imports": [ "dotnetcore" @@ -56,10 +56,7 @@ "build_tests_args": "", "run_tests_args": "", "aws_crt_platform_target": "x86" - }, - "!test_steps": [ - "dotnet --version" - ] + } }, "x64": { "variables": { From ab2493a2a76b851a961314320dd806170ac43fe4 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 25 Jan 2023 09:23:26 -0800 Subject: [PATCH 21/36] reset CI --- .github/workflows/ci.yml | 236 +++++++++++++++++---------------------- builder.json | 4 +- global.json | 5 - tests/tests.csproj | 3 +- 4 files changed, 106 insertions(+), 142 deletions(-) delete mode 100644 global.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 48b7359..a689d81 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: - '!main' env: - BUILDER_VERSION: v0.9.18 + BUILDER_VERSION: v0.9.17 BUILDER_SOURCE: releases BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net PACKAGE_NAME: aws-crt-dotnet @@ -18,129 +18,98 @@ env: AWS_REGION: us-east-1 jobs: - # linux-compat: - # runs-on: ubuntu-20.04 - # strategy: - # matrix: - # image: - # - al2-x64 - # steps: - # - name: Build ${{ env.PACKAGE_NAME }} + consumers - # run: | - # aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh - # ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} --spec=downstream - - # linux-arm: - # runs-on: ubuntu-20.04 - # strategy: - # matrix: - # arch: [arm64] - # steps: - # - name: Install qemu/docker - # run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - # # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages - # - name: Build ${{ env.PACKAGE_NAME }} + consumers - # run: | - # aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh - # ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-ubuntu-20-aarch64 build -p ${{ env.PACKAGE_NAME }} --target=linux-${{ matrix.arch }} + linux-compat: + runs-on: ubuntu-20.04 + strategy: + matrix: + image: + - al2-x64 + steps: + - name: Build ${{ env.PACKAGE_NAME }} + consumers + run: | + aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh + ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} --spec=downstream - # linux-compiler-compat: - # runs-on: ubuntu-latest - # strategy: - # matrix: - # compiler: - # - clang-3 - # - clang-6 - # - clang-8 - # - clang-9 - # - clang-10 - # - clang-11 - # - gcc-4.8 - # - gcc-5 - # - gcc-6 - # - gcc-7 - # - gcc-8 - # steps: - # # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages - # - name: Build ${{ env.PACKAGE_NAME }} - # run: | - # aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh - # ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }} --spec downstream + linux-arm: + runs-on: ubuntu-20.04 + strategy: + matrix: + arch: [arm64] + steps: + - name: Install qemu/docker + run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages + - name: Build ${{ env.PACKAGE_NAME }} + consumers + run: | + aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh + ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-ubuntu-20-aarch64 build -p ${{ env.PACKAGE_NAME }} --target=linux-${{ matrix.arch }} - # linux_mono: - # runs-on: ubuntu-20.04 - # steps: - # - name: Build ${{ env.PACKAGE_NAME }} - # run: | - # python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')" - # chmod a+x builder - # ./builder build -p ${{ env.PACKAGE_NAME }} --variant=mono_test + linux-compiler-compat: + runs-on: ubuntu-latest + strategy: + matrix: + compiler: + - clang-3 + - clang-6 + - clang-8 + - clang-9 + - clang-10 + - clang-11 + - gcc-4.8 + - gcc-5 + - gcc-6 + - gcc-7 + - gcc-8 + steps: + # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages + - name: Build ${{ env.PACKAGE_NAME }} + run: | + aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh + ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }} --spec downstream - # clang-sanitizers: - # runs-on: ubuntu-20.04 - # strategy: - # matrix: - # sanitizers: [",thread", ",address,undefined"] - # steps: - # # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages - # - name: Build ${{ env.PACKAGE_NAME }} - # run: | - # aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh - # ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=clang-11 --cmake-extra=-DENABLE_SANITIZERS=ON --cmake-extra=-DSANITIZERS="${{ matrix.sanitizers }}" + linux_mono: + runs-on: ubuntu-20.04 + steps: + - name: Build ${{ env.PACKAGE_NAME }} + run: | + python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')" + chmod a+x builder + ./builder build -p ${{ env.PACKAGE_NAME }} --variant=mono_test - # windows-vc16: - # runs-on: windows-2019 - # strategy: - # matrix: - # arch: [x64] - # steps: - # - uses: ilammy/msvc-dev-cmd@v1 - # with: - # arch: ${{ matrix.arch }} - # uwp: false - # spectre: true - # - name: Build ${{ env.PACKAGE_NAME }} + consumers - # run: | - # python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" - # python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream + clang-sanitizers: + runs-on: ubuntu-20.04 + strategy: + matrix: + sanitizers: [",thread", ",address,undefined"] + steps: + # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages + - name: Build ${{ env.PACKAGE_NAME }} + run: | + aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh + ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=clang-11 --cmake-extra=-DENABLE_SANITIZERS=ON --cmake-extra=-DSANITIZERS="${{ matrix.sanitizers }}" - windows-vc14: + windows-vc16: runs-on: windows-2019 strategy: matrix: arch: [x64] steps: - - uses: actions/setup-dotnet@v3 - with: - dotnet-version: 5.0 - uses: ilammy/msvc-dev-cmd@v1 with: - toolset: 14.0 arch: ${{ matrix.arch }} uwp: false spectre: true - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" - python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-14 downstream + python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream - windows-vc14-x86: + windows-vc14: runs-on: windows-2019 strategy: matrix: - arch: [x86] - + arch: [x86, x64] steps: - - name: Checkout Source - uses: actions/checkout@v3 - with: - submodules: true - fetch-depth: 0 - - uses: actions/setup-dotnet@v3 - with: - dotnet-version: | - 3.1.x - 5.0.x - uses: ilammy/msvc-dev-cmd@v1 with: toolset: 14.0 @@ -151,37 +120,38 @@ jobs: run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-14 downstream - # osx: - # runs-on: macos-11 - # steps: - # - name: Build ${{ env.PACKAGE_NAME }} + consumers - # run: | - # python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')" - # chmod a+x builder - # ./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream - # # cross-compile for Apple silicon - # # it would be better to run tests natively on one of these machines, - # # but we don't have access to one in the cloud, so for now just cross-compile - # osx-arm64-cross-compile: - # runs-on: macos-11 - # steps: - # - name: Build ${{ env.PACKAGE_NAME }} + consumers - # run: | - # python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')" - # chmod a+x builder - # ./builder build -p ${{ env.PACKAGE_NAME }} --target macos-arm64 run_tests=false - # test `lipo aws-crt-dotnet/build/Arm64/lib/libaws-crt-dotnet-ARM64.dylib -archs` = "arm64" + osx: + runs-on: macos-11 + steps: + - name: Build ${{ env.PACKAGE_NAME }} + consumers + run: | + python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')" + chmod a+x builder + ./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream + + # cross-compile for Apple silicon + # it would be better to run tests natively on one of these machines, + # but we don't have access to one in the cloud, so for now just cross-compile + osx-arm64-cross-compile: + runs-on: macos-11 + steps: + - name: Build ${{ env.PACKAGE_NAME }} + consumers + run: | + python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')" + chmod a+x builder + ./builder build -p ${{ env.PACKAGE_NAME }} --target macos-arm64 run_tests=false + test `lipo aws-crt-dotnet/build/Arm64/lib/libaws-crt-dotnet-ARM64.dylib -archs` = "arm64" - # check-submodules: - # runs-on: ubuntu-20.04 - # steps: - # - name: Checkout Source - # uses: actions/checkout@v3 - # with: - # submodules: true - # fetch-depth: 0 - # - name: Check Submodules - # # note: using "@main" because "@${{env.BUILDER_VERSION}}" doesn't work - # # https://github.com/actions/runner/issues/480 - # uses: awslabs/aws-crt-builder/.github/actions/check-submodules@main + check-submodules: + runs-on: ubuntu-20.04 + steps: + - name: Checkout Source + uses: actions/checkout@v3 + with: + submodules: true + fetch-depth: 0 + - name: Check Submodules + # note: using "@main" because "@${{env.BUILDER_VERSION}}" doesn't work + # https://github.com/actions/runner/issues/480 + uses: awslabs/aws-crt-builder/.github/actions/check-submodules@main diff --git a/builder.json b/builder.json index 8ca94b4..faf2cb8 100644 --- a/builder.json +++ b/builder.json @@ -5,7 +5,6 @@ "dotnet pack -p:TargetFrameworks=netstandard2.0 -p:AwsCrtPlatformTarget={aws_crt_platform_target}" ], "test_steps": [ - "dotnet --version", "dotnet build tests/tests.csproj {build_tests_args}", "dotnet test tests --no-build {run_tests_args}" ], @@ -56,7 +55,8 @@ "build_tests_args": "", "run_tests_args": "", "aws_crt_platform_target": "x86" - } + }, + "!test_steps": [] }, "x64": { "variables": { diff --git a/global.json b/global.json deleted file mode 100644 index bb4954b..0000000 --- a/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk": { - "version": "5.0.408" - } -} \ No newline at end of file diff --git a/tests/tests.csproj b/tests/tests.csproj index 70c3104..7c7ad9f 100644 --- a/tests/tests.csproj +++ b/tests/tests.csproj @@ -1,7 +1,6 @@ - x86 x64 false @@ -18,7 +17,7 @@ Disable net5.0 for x86 for now and migrate to 6.0 (5.0 is eol)/fix dep script. --> - netcoreapp3.1;net5.0 + netcoreapp3.1 From 6185d44871cec9a95f750a549075c937817f1640 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 25 Jan 2023 09:27:46 -0800 Subject: [PATCH 22/36] reset builder.json , setup dotnet step --- .github/workflows/ci.yml | 18 +++++++++++++++++ builder.json | 43 ++++++++++++++++++++-------------------- 2 files changed, 40 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a689d81..aef9d20 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,6 +94,15 @@ jobs: matrix: arch: [x64] steps: + - name: Checkout Source + uses: actions/checkout@v3 + with: + submodules: true + fetch-depth: 0 + - name: Setup dotnet + uses: actions/setup-dotnet@v3 + with: + dotnet-version: '5.0.x' - uses: ilammy/msvc-dev-cmd@v1 with: arch: ${{ matrix.arch }} @@ -110,6 +119,15 @@ jobs: matrix: arch: [x86, x64] steps: + - name: Checkout Source + uses: actions/checkout@v3 + with: + submodules: true + fetch-depth: 0 + - name: Setup dotnet + uses: actions/setup-dotnet@v3 + with: + dotnet-version: '5.0.x' - uses: ilammy/msvc-dev-cmd@v1 with: toolset: 14.0 diff --git a/builder.json b/builder.json index faf2cb8..a47b6bf 100644 --- a/builder.json +++ b/builder.json @@ -31,9 +31,9 @@ "AWS_DOTNET_RUNTIME": "linux-x64" }, "variables": { - "build_tests_args": "", - "run_tests_args": "", - "aws_crt_platform_target": "x64" + "build_tests_args" : "", + "run_tests_args" : "", + "aws_crt_platform_target" : "x64" } }, "arm64": { @@ -41,9 +41,9 @@ "AWS_DOTNET_RUNTIME": "linux-arm64" }, "variables": { - "run_tests_args": "--runtime linux-arm64 -p:PlatformTarget=Arm -p:Platform=Arm", + "run_tests_args" : "--runtime linux-arm64 -p:PlatformTarget=Arm -p:Platform=Arm", "build_tests_args": "-p:AwsCrtPlatformTarget=Arm64 -p:Platform=Arm64 -p:PlatformTarget=Arm64 --runtime linux-arm64 && mv tests/bin/Arm64 tests/bin/Arm", - "aws_crt_platform_target": "arm64" + "aws_crt_platform_target" : "arm64" } } } @@ -52,45 +52,46 @@ "architectures": { "x86": { "variables": { - "build_tests_args": "", - "run_tests_args": "", - "aws_crt_platform_target": "x86" + "build_tests_args" : "", + "run_tests_args" : "", + "aws_crt_platform_target" : "x86" }, - "!test_steps": [] + "!test_steps": [] }, "x64": { "variables": { - "build_tests_args": "", - "run_tests_args": "", - "aws_crt_platform_target": "x64" + "build_tests_args" : "", + "run_tests_args" : "", + "aws_crt_platform_target" : "x64" } } } }, - "macos": { + "macos" :{ "architectures": { "x64": { "variables": { - "build_tests_args": "", - "run_tests_args": "", - "aws_crt_platform_target": "x64" + "build_tests_args" : "", + "run_tests_args" : "", + "aws_crt_platform_target" : "x64" } }, "arm64": { "variables": { - "build_tests_args": "", - "run_tests_args": "", - "aws_crt_platform_target": "Arm64" + "build_tests_args" : "", + "run_tests_args" : "", + "aws_crt_platform_target" : "Arm64" } } } } }, + "variants": { - "mono_test": { + "mono_test" : { "!test_steps": [ "dotnet build tests/tests.csproj -t:MonoTest {build_tests_args}" ] } } -} \ No newline at end of file +} From 91a519776bdbbf1987f7a012648c96d12e6c0c25 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 25 Jan 2023 09:32:01 -0800 Subject: [PATCH 23/36] add comment --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aef9d20..e2cff80 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -127,7 +127,7 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v3 with: - dotnet-version: '5.0.x' + dotnet-version: '5.0.x' #TODO: Specify architecture to install 32 bit .net when that is supported (https://github.com/actions/setup-dotnet/issues/72) - uses: ilammy/msvc-dev-cmd@v1 with: toolset: 14.0 From 21a08959ae59dc52a49be1e90d0a523c312f4462 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 25 Jan 2023 10:00:24 -0800 Subject: [PATCH 24/36] remove checkout source action --- .github/workflows/ci.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2cff80..b049635 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,11 +94,6 @@ jobs: matrix: arch: [x64] steps: - - name: Checkout Source - uses: actions/checkout@v3 - with: - submodules: true - fetch-depth: 0 - name: Setup dotnet uses: actions/setup-dotnet@v3 with: @@ -119,11 +114,6 @@ jobs: matrix: arch: [x86, x64] steps: - - name: Checkout Source - uses: actions/checkout@v3 - with: - submodules: true - fetch-depth: 0 - name: Setup dotnet uses: actions/setup-dotnet@v3 with: From f00dfc07f15cdc513a68fc0e566ec6fbfb139e1c Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 25 Jan 2023 10:01:25 -0800 Subject: [PATCH 25/36] latest submodules --- crt/aws-c-auth | 2 +- crt/aws-c-cal | 2 +- crt/aws-c-common | 2 +- crt/aws-c-compression | 2 +- crt/aws-c-http | 2 +- crt/aws-c-io | 2 +- crt/aws-c-sdkutils | 2 +- crt/aws-checksums | 2 +- crt/aws-lc | 2 +- crt/s2n | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/crt/aws-c-auth b/crt/aws-c-auth index 59556cd..bad1066 160000 --- a/crt/aws-c-auth +++ b/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit 59556cd46e684e5bfa27aa074caa77795ce3869f +Subproject commit bad1066f0a93f3a7df86c94cc03076fa6b901bd2 diff --git a/crt/aws-c-cal b/crt/aws-c-cal index 1458c70..ac4216b 160000 --- a/crt/aws-c-cal +++ b/crt/aws-c-cal @@ -1 +1 @@ -Subproject commit 1458c70a26877345ca28e333a092096afd410774 +Subproject commit ac4216b78d5323b5b8ce95a3dd4a8fc0f95e2d33 diff --git a/crt/aws-c-common b/crt/aws-c-common index be35e65..5e64b03 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit be35e65a6c67ae2ffd126516c9783ac1dd2e8910 +Subproject commit 5e64b039356c72d17fcf1fb0bfc7637f8c2270f7 diff --git a/crt/aws-c-compression b/crt/aws-c-compression index 5fab8bc..b517b7d 160000 --- a/crt/aws-c-compression +++ b/crt/aws-c-compression @@ -1 +1 @@ -Subproject commit 5fab8bc5ab5321d86f6d153b06062419080820ec +Subproject commit b517b7decd0dac30be2162f5186c250221c53aff diff --git a/crt/aws-c-http b/crt/aws-c-http index 30230be..dd34461 160000 --- a/crt/aws-c-http +++ b/crt/aws-c-http @@ -1 +1 @@ -Subproject commit 30230bede737dda19dc5ed2b15bb37b70aeb71e1 +Subproject commit dd34461987947672444d0bc872c5a733dfdb9711 diff --git a/crt/aws-c-io b/crt/aws-c-io index 278e588..b52181a 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit 278e5887f7408dfc1db0489d9ca4d1984b6650ef +Subproject commit b52181af655c090713fe01f14d7ccb95aab8dec5 diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils index e3c23f4..208a701 160000 --- a/crt/aws-c-sdkutils +++ b/crt/aws-c-sdkutils @@ -1 +1 @@ -Subproject commit e3c23f4aca31d9e66df25827645f72cbcbfb657a +Subproject commit 208a701fa01e99c7c8cc3dcebc8317da71362972 diff --git a/crt/aws-checksums b/crt/aws-checksums index 41df303..ad53be1 160000 --- a/crt/aws-checksums +++ b/crt/aws-checksums @@ -1 +1 @@ -Subproject commit 41df3031b92120b6d8127b7b7122391d5ac6f33f +Subproject commit ad53be196a25bbefa3700a01187fdce573a7d2d0 diff --git a/crt/aws-lc b/crt/aws-lc index 11b50d3..75a73bf 160000 --- a/crt/aws-lc +++ b/crt/aws-lc @@ -1 +1 @@ -Subproject commit 11b50d39cf2378703a4ca6b6fee9d76a2e9852d1 +Subproject commit 75a73bfabf1be384b49c7f92da6fdfd9d867069e diff --git a/crt/s2n b/crt/s2n index 8314a96..52661e9 160000 --- a/crt/s2n +++ b/crt/s2n @@ -1 +1 @@ -Subproject commit 8314a96de0c33a426ae877856a8a1a431d354e0d +Subproject commit 52661e933c99825f208f376c98a6a292b49be680 From c7040c390fb6974e48dadc9147c0782577ef8a4d Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 25 Jan 2023 10:23:39 -0800 Subject: [PATCH 26/36] include ms test framework & adapter --- tests/tests.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/tests.csproj b/tests/tests.csproj index 7c7ad9f..13d9117 100644 --- a/tests/tests.csproj +++ b/tests/tests.csproj @@ -27,6 +27,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all + + From da420273ce0a507e2560f61a8448b28711a75701 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 25 Jan 2023 10:29:15 -0800 Subject: [PATCH 27/36] fix typo --- tests/tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests.csproj b/tests/tests.csproj index 13d9117..8f367ff 100644 --- a/tests/tests.csproj +++ b/tests/tests.csproj @@ -27,7 +27,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + From 5dbcc56658d377df8ace103baf8b97f9c866d516 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 25 Jan 2023 10:34:53 -0800 Subject: [PATCH 28/36] add visual studio --- tests/tests.csproj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/tests.csproj b/tests/tests.csproj index 8f367ff..888e48f 100644 --- a/tests/tests.csproj +++ b/tests/tests.csproj @@ -27,8 +27,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - + From 1e821f0b881df4289a4a6b0b92cdf1f8aeb93ee3 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 25 Jan 2023 10:39:30 -0800 Subject: [PATCH 29/36] reset builder.json --- builder.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builder.json b/builder.json index a47b6bf..e9cd42e 100644 --- a/builder.json +++ b/builder.json @@ -55,8 +55,7 @@ "build_tests_args" : "", "run_tests_args" : "", "aws_crt_platform_target" : "x86" - }, - "!test_steps": [] + } }, "x64": { "variables": { From 02d54b8ac3275da496c886b66ef68ce08a32d753 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 25 Jan 2023 11:07:28 -0800 Subject: [PATCH 30/36] add comment and use vsversion property --- .github/workflows/ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b049635..25cd13a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,15 +94,10 @@ jobs: matrix: arch: [x64] steps: - - name: Setup dotnet + - name: Setup dotnet # Use setup dotnet action as Windows-2019 image no longer contains .net5.0 uses: actions/setup-dotnet@v3 with: dotnet-version: '5.0.x' - - uses: ilammy/msvc-dev-cmd@v1 - with: - arch: ${{ matrix.arch }} - uwp: false - spectre: true - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" @@ -124,6 +119,7 @@ jobs: arch: ${{ matrix.arch }} uwp: false spectre: true + vsversion: 2015 - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" From bd2022e12f471174ff9442a55f37f9f4df912cb8 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 25 Jan 2023 11:12:50 -0800 Subject: [PATCH 31/36] remove msvc dev --- .github/workflows/ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25cd13a..0109ea7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -113,13 +113,6 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: '5.0.x' #TODO: Specify architecture to install 32 bit .net when that is supported (https://github.com/actions/setup-dotnet/issues/72) - - uses: ilammy/msvc-dev-cmd@v1 - with: - toolset: 14.0 - arch: ${{ matrix.arch }} - uwp: false - spectre: true - vsversion: 2015 - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" From 41b9b25d5bd44ac9fcf94dfde51d14400d9ebd7e Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 25 Jan 2023 11:21:12 -0800 Subject: [PATCH 32/36] re add msvc --- .github/workflows/ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0109ea7..d32acf7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,6 +98,12 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: '5.0.x' + - uses: ilammy/msvc-dev-cmd@v1 + with: + arch: ${{ matrix.arch }} + uwp: false + spectre: true + - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" @@ -113,6 +119,12 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: '5.0.x' #TODO: Specify architecture to install 32 bit .net when that is supported (https://github.com/actions/setup-dotnet/issues/72) + - uses: ilammy/msvc-dev-cmd@v1 + with: + toolset: 14.0 + arch: ${{ matrix.arch }} + uwp: false + spectre: true - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" From 759548c6873be76671d25ade11f24af43d0e892c Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 25 Jan 2023 11:24:06 -0800 Subject: [PATCH 33/36] remove target --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d32acf7..2b8bf4b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -122,13 +122,12 @@ jobs: - uses: ilammy/msvc-dev-cmd@v1 with: toolset: 14.0 - arch: ${{ matrix.arch }} uwp: false spectre: true - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" - python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-14 downstream + python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} osx: runs-on: macos-11 From ca78391aa886bbd09251ff80e0becdba5fa3c6e7 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 25 Jan 2023 11:40:31 -0800 Subject: [PATCH 34/36] readd arch --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2b8bf4b..d32acf7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -122,12 +122,13 @@ jobs: - uses: ilammy/msvc-dev-cmd@v1 with: toolset: 14.0 + arch: ${{ matrix.arch }} uwp: false spectre: true - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" - python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} + python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-14 downstream osx: runs-on: macos-11 From d817d11ab3cc0a022935a69d8a43e7fc8263677a Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 25 Jan 2023 11:56:08 -0800 Subject: [PATCH 35/36] disable tests for 32 bit --- .github/workflows/ci.yml | 1 - builder.json | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d32acf7..ff8c277 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,7 +103,6 @@ jobs: arch: ${{ matrix.arch }} uwp: false spectre: true - - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" diff --git a/builder.json b/builder.json index e9cd42e..1d38416 100644 --- a/builder.json +++ b/builder.json @@ -55,7 +55,8 @@ "build_tests_args" : "", "run_tests_args" : "", "aws_crt_platform_target" : "x86" - } + }, + "!test_steps": [] }, "x64": { "variables": { From 9d900fb0517d8acef3e4a5788009843c82276de6 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 25 Jan 2023 13:30:19 -0800 Subject: [PATCH 36/36] Add todo --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff8c277..a075706 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,6 +108,7 @@ jobs: python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream + # TODO: Fix this to run on 14.0 toolset. Currently, it doesn't respect the toolset parameter. windows-vc14: runs-on: windows-2019 strategy: