From 26e5c894be613432a0c638e13109f9d068bd204a Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Thu, 15 Feb 2024 15:00:10 -0600 Subject: [PATCH 01/10] Move integration tests to M1 CI runners, use xcodebuild to test --- .github/workflows/integration-test.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index c301a05bff1..7325ae892ed 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -21,18 +21,18 @@ jobs: matrix: # This matrix runs tests on Mac, on oldest & newest supported Xcodes runner: - - macos-12 - - macos-13 + - macos-13-xlarge + - macos-14-xlarge xcode: - - Xcode_14.0.1 + - Xcode_14.1 - Xcode_15.2 exclude: # Don't run old macOS with new Xcode - - runner: macos-12 + - runner: macos-13-xlarge xcode: Xcode_15.2 # Don't run new macOS with old Xcode - - runner: macos-13 - xcode: Xcode_14.0.1 + - runner: macos-14-xlarge + xcode: Xcode_14.1 steps: - name: Configure AWS Credentials for Integration Tests uses: aws-actions/configure-aws-credentials@v4 @@ -156,4 +156,10 @@ jobs: - name: Build Integration Tests run: swift build --build-tests - name: Run Integration Tests - run: swift test + run: | + set -o pipefail && \ + NSUnbufferedIO=YES xcodebuild \ + -scheme aws-sdk-swift \ + -destination 'platform=OS X' \ + test 2>&1 \ + | xcpretty From 404be48880509992de6379923f246cca91287db9 Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Thu, 15 Feb 2024 15:18:04 -0600 Subject: [PATCH 02/10] Put xcodebuild in right place --- .github/workflows/integration-test.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 7325ae892ed..f61961bdca5 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -86,7 +86,13 @@ jobs: - name: Build Integration Tests run: swift build --build-tests - name: Run Integration Tests - run: swift test + run: | + set -o pipefail && \ + NSUnbufferedIO=YES xcodebuild \ + -scheme aws-sdk-swift \ + -destination 'platform=OS X' \ + test 2>&1 \ + | xcpretty linux: runs-on: ubuntu-latest @@ -156,10 +162,4 @@ jobs: - name: Build Integration Tests run: swift build --build-tests - name: Run Integration Tests - run: | - set -o pipefail && \ - NSUnbufferedIO=YES xcodebuild \ - -scheme aws-sdk-swift \ - -destination 'platform=OS X' \ - test 2>&1 \ - | xcpretty + run: swift test From 7fa55601b778e53698d754c65da1486b2a8f84a8 Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Thu, 15 Feb 2024 15:32:29 -0600 Subject: [PATCH 03/10] Fix scheme name --- .github/workflows/integration-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index f61961bdca5..5dc4b3a7b2c 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -89,7 +89,7 @@ jobs: run: | set -o pipefail && \ NSUnbufferedIO=YES xcodebuild \ - -scheme aws-sdk-swift \ + -scheme aws-sdk-swift-Package \ -destination 'platform=OS X' \ test 2>&1 \ | xcpretty From 7cb061734d2c79c17361149992b86780ec45b66e Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Thu, 15 Feb 2024 16:04:30 -0600 Subject: [PATCH 04/10] List destinations --- .github/workflows/integration-test.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 5dc4b3a7b2c..68bd732c615 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -84,7 +84,12 @@ jobs: - name: Prepare Integration Tests run: ./scripts/ci_steps/prepare_integration_tests.sh - name: Build Integration Tests - run: swift build --build-tests + run: | + set -o pipefail && \ + NSUnbufferedIO=YES \ + xcodebuild \ + -list/ + -destination 'platform=OS X' - name: Run Integration Tests run: | set -o pipefail && \ From 7a024e55f89de4382389824d63d06f3e5c72ac10 Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Thu, 15 Feb 2024 16:11:03 -0600 Subject: [PATCH 05/10] Fix backslash --- .github/workflows/integration-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 68bd732c615..b544f41deb3 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -88,7 +88,7 @@ jobs: set -o pipefail && \ NSUnbufferedIO=YES \ xcodebuild \ - -list/ + -list \ -destination 'platform=OS X' - name: Run Integration Tests run: | From d0521fee21a584ee46d92c05f6509e986dc5b03e Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Thu, 15 Feb 2024 16:23:17 -0600 Subject: [PATCH 06/10] Build for testing --- .github/workflows/integration-test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index b544f41deb3..a7cff221594 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -88,8 +88,10 @@ jobs: set -o pipefail && \ NSUnbufferedIO=YES \ xcodebuild \ - -list \ + -scheme aws-sdk-swift-Package \ -destination 'platform=OS X' + build-for-testing 2>&1 \ + | xcpretty - name: Run Integration Tests run: | set -o pipefail && \ From d54599a7740b244c98750b8afaa75eb8fbb413fe Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Thu, 15 Feb 2024 16:31:26 -0600 Subject: [PATCH 07/10] Fix xcodebuild --- .github/workflows/integration-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index a7cff221594..5063c0f349b 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -89,7 +89,7 @@ jobs: NSUnbufferedIO=YES \ xcodebuild \ -scheme aws-sdk-swift-Package \ - -destination 'platform=OS X' + -destination 'platform=OS X' \ build-for-testing 2>&1 \ | xcpretty - name: Run Integration Tests From 1c50a6b5353f955f5d6cbdf1b14e9f8e39c2e2bd Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Thu, 15 Feb 2024 18:10:02 -0600 Subject: [PATCH 08/10] Revert to swift build & swift run --- .github/workflows/integration-test.yml | 32 ++++++++++++++------------ 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 5063c0f349b..a13ab3d1e5c 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -84,22 +84,24 @@ jobs: - name: Prepare Integration Tests run: ./scripts/ci_steps/prepare_integration_tests.sh - name: Build Integration Tests - run: | - set -o pipefail && \ - NSUnbufferedIO=YES \ - xcodebuild \ - -scheme aws-sdk-swift-Package \ - -destination 'platform=OS X' \ - build-for-testing 2>&1 \ - | xcpretty + run: swift build --build-tests + #run: | + # set -o pipefail && \ + # NSUnbufferedIO=YES \ + # xcodebuild \ + # -scheme aws-sdk-swift-Package \ + # -destination 'platform=OS X' \ + # build-for-testing 2>&1 \ + # | xcpretty - name: Run Integration Tests - run: | - set -o pipefail && \ - NSUnbufferedIO=YES xcodebuild \ - -scheme aws-sdk-swift-Package \ - -destination 'platform=OS X' \ - test 2>&1 \ - | xcpretty + run: swift test + #run: | + #set -o pipefail && \ + #NSUnbufferedIO=YES xcodebuild \ + #-scheme aws-sdk-swift-Package \ + #-destination 'platform=OS X' \ + #test 2>&1 \ + #| xcpretty linux: runs-on: ubuntu-latest From 88366082966ccae32a44927e475f5dc9b0d0ff6c Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Thu, 15 Feb 2024 18:16:32 -0600 Subject: [PATCH 09/10] Add .gitkeep file for AWSSTSIntegrationTests/Resources --- .../Services/AWSSTSIntegrationTests/Resources/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 IntegrationTests/Services/AWSSTSIntegrationTests/Resources/.gitkeep diff --git a/IntegrationTests/Services/AWSSTSIntegrationTests/Resources/.gitkeep b/IntegrationTests/Services/AWSSTSIntegrationTests/Resources/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d From 0af771459980e6c601d202a22d66e8cb92f05d8f Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Fri, 16 Feb 2024 10:03:45 -0600 Subject: [PATCH 10/10] Revert build/test to Swift toolchain --- .github/workflows/integration-test.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index a13ab3d1e5c..e245a2cef10 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -85,23 +85,8 @@ jobs: run: ./scripts/ci_steps/prepare_integration_tests.sh - name: Build Integration Tests run: swift build --build-tests - #run: | - # set -o pipefail && \ - # NSUnbufferedIO=YES \ - # xcodebuild \ - # -scheme aws-sdk-swift-Package \ - # -destination 'platform=OS X' \ - # build-for-testing 2>&1 \ - # | xcpretty - name: Run Integration Tests run: swift test - #run: | - #set -o pipefail && \ - #NSUnbufferedIO=YES xcodebuild \ - #-scheme aws-sdk-swift-Package \ - #-destination 'platform=OS X' \ - #test 2>&1 \ - #| xcpretty linux: runs-on: ubuntu-latest