From 33b1ce0172ddeefdb037d3659cb140b70e1652a7 Mon Sep 17 00:00:00 2001 From: Nicki Stone Date: Tue, 2 Nov 2021 11:17:26 -0700 Subject: [PATCH 01/21] build for watchos and tvos --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index deb47f311..59173a2a9 100644 --- a/Package.swift +++ b/Package.swift @@ -7,7 +7,7 @@ let excludesFromAll = ["tests", "cmake", "CONTRIBUTING.md", var packageTargets: [Target] = [] var package = Package(name: "AwsCrt", - platforms: [.iOS(.v11), .macOS(.v10_14)], + platforms: [.iOS(.v11), .macOS(.v10_14), .tvOS(.v12), .watchOS(.v5)], products: [ .library(name: "AwsCommonRuntimeKit", targets: ["AwsCommonRuntimeKit"]), .executable(name: "Elasticurl", targets: ["Elasticurl"]) From e91b005a7a2fdab5914d1231d055191ff2366d7b Mon Sep 17 00:00:00 2001 From: Nicki Stone Date: Tue, 2 Nov 2021 11:18:25 -0700 Subject: [PATCH 02/21] formatting --- Package.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index 59173a2a9..2de2151b5 100644 --- a/Package.swift +++ b/Package.swift @@ -8,10 +8,10 @@ var packageTargets: [Target] = [] var package = Package(name: "AwsCrt", platforms: [.iOS(.v11), .macOS(.v10_14), .tvOS(.v12), .watchOS(.v5)], - products: [ - .library(name: "AwsCommonRuntimeKit", targets: ["AwsCommonRuntimeKit"]), - .executable(name: "Elasticurl", targets: ["Elasticurl"]) - ] + products: [ + .library(name: "AwsCommonRuntimeKit", targets: ["AwsCommonRuntimeKit"]), + .executable(name: "Elasticurl", targets: ["Elasticurl"]) + ] ) var calDependencies: [Target.Dependency] = ["AwsCCommon"] From b040b99921f91556da313d929fc9c22cb2872627 Mon Sep 17 00:00:00 2001 From: Nicki Stone Date: Tue, 2 Nov 2021 11:17:26 -0700 Subject: [PATCH 03/21] build for watchos and tvos --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index deb47f311..59173a2a9 100644 --- a/Package.swift +++ b/Package.swift @@ -7,7 +7,7 @@ let excludesFromAll = ["tests", "cmake", "CONTRIBUTING.md", var packageTargets: [Target] = [] var package = Package(name: "AwsCrt", - platforms: [.iOS(.v11), .macOS(.v10_14)], + platforms: [.iOS(.v11), .macOS(.v10_14), .tvOS(.v12), .watchOS(.v5)], products: [ .library(name: "AwsCommonRuntimeKit", targets: ["AwsCommonRuntimeKit"]), .executable(name: "Elasticurl", targets: ["Elasticurl"]) From 3e587dfd345ddd939eabccc2c862bf1f0db732b0 Mon Sep 17 00:00:00 2001 From: Nicki Stone Date: Tue, 2 Nov 2021 11:18:25 -0700 Subject: [PATCH 04/21] formatting --- Package.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index 59173a2a9..2de2151b5 100644 --- a/Package.swift +++ b/Package.swift @@ -8,10 +8,10 @@ var packageTargets: [Target] = [] var package = Package(name: "AwsCrt", platforms: [.iOS(.v11), .macOS(.v10_14), .tvOS(.v12), .watchOS(.v5)], - products: [ - .library(name: "AwsCommonRuntimeKit", targets: ["AwsCommonRuntimeKit"]), - .executable(name: "Elasticurl", targets: ["Elasticurl"]) - ] + products: [ + .library(name: "AwsCommonRuntimeKit", targets: ["AwsCommonRuntimeKit"]), + .executable(name: "Elasticurl", targets: ["Elasticurl"]) + ] ) var calDependencies: [Target.Dependency] = ["AwsCCommon"] From 93379c8bd90dd67dd0bb53598d9211021faf0124 Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Tue, 2 Nov 2021 14:16:00 -0700 Subject: [PATCH 05/21] Added tvOS and watchOS CI --- .github/workflows/ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b050b7319..3ba903b55 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,8 +98,14 @@ jobs: 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 - ios: + devices: runs-on: macos-11 + strategy: + matrix: + target: + - ios + - tvos + - watchos steps: - name: Checkout Sources uses: actions/checkout@v2 @@ -109,4 +115,4 @@ jobs: 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 --target=ios-armv8 + ./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream --target=${{ matrix.target }}-armv8 From 708de979a2c2122b8cbfc96bcd72fbc3990c009f Mon Sep 17 00:00:00 2001 From: Nicki Stone Date: Tue, 2 Nov 2021 14:21:55 -0700 Subject: [PATCH 06/21] correct tvos version --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 2de2151b5..88ac905ba 100644 --- a/Package.swift +++ b/Package.swift @@ -7,7 +7,7 @@ let excludesFromAll = ["tests", "cmake", "CONTRIBUTING.md", var packageTargets: [Target] = [] var package = Package(name: "AwsCrt", - platforms: [.iOS(.v11), .macOS(.v10_14), .tvOS(.v12), .watchOS(.v5)], + platforms: [.iOS(.v11), .macOS(.v10_14), .tvOS(.v13), .watchOS(.v5)], products: [ .library(name: "AwsCommonRuntimeKit", targets: ["AwsCommonRuntimeKit"]), .executable(name: "Elasticurl", targets: ["Elasticurl"]) From 09bfa12909065f37f6876ce8fa56b3590fdafa79 Mon Sep 17 00:00:00 2001 From: Nicki Stone Date: Tue, 2 Nov 2021 14:23:24 -0700 Subject: [PATCH 07/21] update version of ios --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 88ac905ba..855aed698 100644 --- a/Package.swift +++ b/Package.swift @@ -7,7 +7,7 @@ let excludesFromAll = ["tests", "cmake", "CONTRIBUTING.md", var packageTargets: [Target] = [] var package = Package(name: "AwsCrt", - platforms: [.iOS(.v11), .macOS(.v10_14), .tvOS(.v13), .watchOS(.v5)], + platforms: [.iOS(.v13), .macOS(.v10_14), .tvOS(.v13), .watchOS(.v5)], products: [ .library(name: "AwsCommonRuntimeKit", targets: ["AwsCommonRuntimeKit"]), .executable(name: "Elasticurl", targets: ["Elasticurl"]) From 9a6b2f32abfd7f496eb11d1c691e370f8069e473 Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Tue, 2 Nov 2021 14:20:24 -0700 Subject: [PATCH 08/21] Use apple channel until we verify this works --- .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 3ba903b55..37b62122b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,8 +10,8 @@ on: - 'main' env: - BUILDER_VERSION: v0.8.18 - BUILDER_SOURCE: releases + BUILDER_VERSION: apple + BUILDER_SOURCE: channels BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net PACKAGE_NAME: aws-crt-swift LINUX_BASE_IMAGE: ubuntu-16-x64 From 4f94dda6dab1b4a9d808eeded107929f352d3bef Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Tue, 2 Nov 2021 14:21:34 -0700 Subject: [PATCH 09/21] disable fail-fast on device builds --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 37b62122b..b60a9e6ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,6 +101,7 @@ jobs: devices: runs-on: macos-11 strategy: + fail-fast: false matrix: target: - ios From 5504fda06ffc25d0eb70efa5de08657cc8ee51e9 Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Tue, 2 Nov 2021 15:06:59 -0700 Subject: [PATCH 10/21] Added builds for tvOS and watchOS --- builder.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/builder.json b/builder.json index 7741799a7..c8f52f57f 100644 --- a/builder.json +++ b/builder.json @@ -29,6 +29,16 @@ "xcodebuild -scheme AwsCommonRuntimeKit -destination 'generic/platform=iOS'" ] }, + "tvos": { + "!build_steps": [ + "xcodebuild -scheme AwsCommonRuntimeKit -destination 'generic/platform=tvOS'" + ] + }, + "watchos": { + "!build_steps": [ + "xcodebuild -scheme AwsCommonRuntimeKit -destination 'generic/platform=watchOS'" + ] + }, "macos": { "!test_steps": [ "./integ_test.sh" From 12a5ec94d409f9bf5d7fd3597c15ddd8731a7ffc Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Wed, 3 Nov 2021 08:43:00 -0700 Subject: [PATCH 11/21] updated CI to use S3/ECR and new format --- .github/workflows/ci.yml | 69 ++++++---------------------------------- 1 file changed, 10 insertions(+), 59 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b60a9e6ea..75d2d7be7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,8 +10,8 @@ on: - 'main' env: - BUILDER_VERSION: apple - BUILDER_SOURCE: channels + BUILDER_VERSION: v0.9.0 + BUILDER_SOURCE: releases BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net PACKAGE_NAME: aws-crt-swift LINUX_BASE_IMAGE: ubuntu-16-x64 @@ -32,72 +32,27 @@ jobs: uses: norio-nomura/action-swiftlint@3.1.0 env: DIFF_BASE: ${{ github.base_ref }} - ubuntu: + linux: runs-on: ubuntu-latest strategy: matrix: image: - - aws-crt-swift-5-ubuntu-16-x64 + - ubuntu-16-x64 + - al2-x64 + - centos-x64 steps: - - name: Checkout Sources - uses: actions/checkout@v2 - with: - submodules: true - # 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/${{ matrix.image }}:${{ env.BUILDER_VERSION }} - docker pull $DOCKER_IMAGE - docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --build-dir=/root/${{ env.PACKAGE_NAME }} --spec=downstream - al2: - runs-on: ubuntu-latest - strategy: - matrix: - image: - - aws-crt-swift-5-al2-x64 - steps: - - name: Checkout Sources - uses: actions/checkout@v2 - with: - submodules: true - # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages - - name: Build ${{ env.PACKAGE_NAME }} + consumers - 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/${{ matrix.image }}:${{ env.BUILDER_VERSION }} - docker pull $DOCKER_IMAGE - docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --build-dir=/root/${{ env.PACKAGE_NAME }} --spec=downstream - centos: - runs-on: ubuntu-latest - strategy: - matrix: - image: - - aws-crt-swift-5-centos-x64 - steps: - - name: Checkout Sources - uses: actions/checkout@v2 - with: - submodules: true - # 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/${{ matrix.image }}:${{ env.BUILDER_VERSION }} - docker pull $DOCKER_IMAGE - docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --build-dir=/root/${{ env.PACKAGE_NAME }} --spec=downstream + 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-swift-5-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} osx: runs-on: macos-11 steps: - - name: Checkout Sources - uses: actions/checkout@v2 - with: - submodules: true - 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 + ./builder build -p ${{ env.PACKAGE_NAME }} devices: runs-on: macos-11 strategy: @@ -108,12 +63,8 @@ jobs: - tvos - watchos steps: - - name: Checkout Sources - uses: actions/checkout@v2 - with: - submodules: true - 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 --target=${{ matrix.target }}-armv8 + ./builder build -p ${{ env.PACKAGE_NAME }} --target=${{ matrix.target }}-armv8 From ec1292f1fdde33271f3b26256f242d80393070af Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Wed, 3 Nov 2021 08:46:48 -0700 Subject: [PATCH 12/21] hwut --- .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 75d2d7be7..6ce3660f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,6 @@ env: BUILDER_SOURCE: releases BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net PACKAGE_NAME: aws-crt-swift - LINUX_BASE_IMAGE: ubuntu-16-x64 RUN: ${{ github.run_id }}-${{ github.run_number }} jobs: @@ -43,7 +42,8 @@ jobs: steps: - 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 + 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-swift-5-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} osx: runs-on: macos-11 From bc0e20168600192ac2cd8baf2f4a6f6d1c7d5720 Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Wed, 3 Nov 2021 08:54:58 -0700 Subject: [PATCH 13/21] HWUT --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ce3660f2..af2263e66 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,11 @@ jobs: - 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 + - name: chmod + run: | chmod a+x ./linux-container-ci.sh + - name: run + run: | ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-swift-5-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} osx: runs-on: macos-11 From 945b6d0b9f598bec93278853618531685a0bb5a4 Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Wed, 3 Nov 2021 08:56:14 -0700 Subject: [PATCH 14/21] try /tmp --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index af2263e66..d28894cae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,13 +42,13 @@ jobs: steps: - 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 + aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh /tmp/linux-container-ci.sh - name: chmod run: | - chmod a+x ./linux-container-ci.sh + chmod a+x /tmp/linux-container-ci.sh - name: run run: | - ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-swift-5-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} + /tmp/linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-swift-5-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} osx: runs-on: macos-11 steps: From 8991b1e29acc04fbaa4accc3252e7466226a8e1e Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Wed, 3 Nov 2021 08:57:28 -0700 Subject: [PATCH 15/21] wtf aws --- .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 d28894cae..d7b0c4064 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: steps: - name: Build ${{ env.PACKAGE_NAME }} run: | - aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh /tmp/linux-container-ci.sh + aws s3 cp --debug s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh /tmp/linux-container-ci.sh - name: chmod run: | chmod a+x /tmp/linux-container-ci.sh From 4852b88ee9ce259347185eff085ce891fa93c8a7 Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Wed, 3 Nov 2021 08:58:40 -0700 Subject: [PATCH 16/21] Should probably have credentials huh --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7b0c4064..7b208846e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,9 @@ env: BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net PACKAGE_NAME: aws-crt-swift RUN: ${{ github.run_id }}-${{ github.run_number }} + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + AWS_REGION: us-east-1 jobs: lint: From 8518d511490c5d1363b13c578247090ce26cd9df Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Wed, 3 Nov 2021 09:23:20 -0700 Subject: [PATCH 17/21] Use github channel of builder --- .github/workflows/ci.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b208846e..117df70d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,8 +10,8 @@ on: - 'main' env: - BUILDER_VERSION: v0.9.0 - BUILDER_SOURCE: releases + BUILDER_VERSION: github + BUILDER_SOURCE: channels BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net PACKAGE_NAME: aws-crt-swift RUN: ${{ github.run_id }}-${{ github.run_number }} @@ -45,13 +45,8 @@ jobs: steps: - name: Build ${{ env.PACKAGE_NAME }} run: | - aws s3 cp --debug s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh /tmp/linux-container-ci.sh - - name: chmod - run: | - chmod a+x /tmp/linux-container-ci.sh - - name: run - run: | - /tmp/linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-swift-5-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} + aws s3 cp --debug 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-swift-5-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} osx: runs-on: macos-11 steps: From eed7f3be2d1d4e0621c1fdb38a88c4637e2a5edc Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Wed, 3 Nov 2021 09:29:55 -0700 Subject: [PATCH 18/21] Updated s2n to v1.1.2 --- aws-common-runtime/s2n | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-common-runtime/s2n b/aws-common-runtime/s2n index 875ddd026..3b8e5aaab 160000 --- a/aws-common-runtime/s2n +++ b/aws-common-runtime/s2n @@ -1 +1 @@ -Subproject commit 875ddd026c5cad73dd3a34a9026fbbade38d292b +Subproject commit 3b8e5aaab4c8617fea77786837dc0eab93c14aa8 From aaaa5049cd2b0113f2a8cb81bd3f6d4587fb81ae Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Wed, 3 Nov 2021 09:42:23 -0700 Subject: [PATCH 19/21] Updated ubuntu image name to match builder --- .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 117df70d6..5cc81e553 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: strategy: matrix: image: - - ubuntu-16-x64 + - ubuntu-x64 - al2-x64 - centos-x64 steps: From 79dcdde288450c192abd0daf4a77bd1c2f29d914 Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Wed, 3 Nov 2021 10:40:52 -0700 Subject: [PATCH 20/21] Use v0.9.1 of builder --- .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 5cc81e553..38d202267 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,8 +10,8 @@ on: - 'main' env: - BUILDER_VERSION: github - BUILDER_SOURCE: channels + BUILDER_VERSION: v0.9.1 + BUILDER_SOURCE: releases BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net PACKAGE_NAME: aws-crt-swift RUN: ${{ github.run_id }}-${{ github.run_number }} From 4bc662abf72f69111deb1abb127030a5154de362 Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Wed, 3 Nov 2021 10:59:00 -0700 Subject: [PATCH 21/21] Cleanup builder.json, kick CI --- builder.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/builder.json b/builder.json index c8f52f57f..771f46bf5 100644 --- a/builder.json +++ b/builder.json @@ -10,9 +10,6 @@ "swift test" ], "hosts": { - "ubuntu": {}, - "macos": {}, - "al2": {}, "al2012": { "enabled": false },