From 2d1a22fab634ef5c3b95d523d825978df47ee3b5 Mon Sep 17 00:00:00 2001 From: Janujan Selvaratnam Date: Mon, 15 Jul 2024 14:12:48 -0400 Subject: [PATCH 1/3] Update to latest smoke dependencies --- Package.resolved | 30 ++++++++++++++++++++++++------ Package.swift | 4 ++-- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/Package.resolved b/Package.resolved index 7c7aa13..f747f6c 100644 --- a/Package.resolved +++ b/Package.resolved @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/amzn/smoke-aws.git", "state": { "branch": null, - "revision": "24c05c5faa12a4662584241bebee0a017c3ce9bf", - "version": "2.44.174" + "revision": "2ab12570ff4e45b41f3c1adf9204baf57d9c0147", + "version": "3.0.0" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/amzn/smoke-aws-support.git", "state": { "branch": null, - "revision": "7bdcbdb7b01bf54dfbdeb99d38d8e6edd6a560c1", - "version": "1.1.0" + "revision": "b858670eac000b3a957d85672b915c03275c0d9b", + "version": "2.0.0" } }, { @@ -42,8 +42,8 @@ "repositoryURL": "https://github.com/amzn/smoke-http.git", "state": { "branch": null, - "revision": "77c629dc155170e15cb845ac9504355744328204", - "version": "2.17.1" + "revision": "a6f386fc42d4758719b01a4e45f20c68bed88d50", + "version": "3.0.0" } }, { @@ -73,6 +73,15 @@ "version": "1.1.7" } }, + { + "package": "swift-distributed-tracing", + "repositoryURL": "https://github.com/apple/swift-distributed-tracing.git", + "state": { + "branch": null, + "revision": "11c756c5c4d7de0eeed8595695cadd7fa107aa19", + "version": "1.1.1" + } + }, { "package": "swift-log", "repositoryURL": "https://github.com/apple/swift-log.git", @@ -136,6 +145,15 @@ "version": "1.15.0" } }, + { + "package": "swift-service-context", + "repositoryURL": "https://github.com/apple/swift-service-context.git", + "state": { + "branch": null, + "revision": "ce0141c8f123132dbd02fd45fea448018762df1b", + "version": "1.0.0" + } + }, { "package": "XMLCoding", "repositoryURL": "https://github.com/LiveUI/XMLCoding.git", diff --git a/Package.swift b/Package.swift index d2f731c..6cb6aa6 100644 --- a/Package.swift +++ b/Package.swift @@ -26,8 +26,8 @@ let package = Package( targets: ["SmokeDynamoDB"]), ], dependencies: [ - .package(url: "https://github.com/amzn/smoke-aws.git", from: "2.42.37"), - .package(url: "https://github.com/amzn/smoke-http.git", from: "2.16.0"), + .package(url: "https://github.com/amzn/smoke-aws.git", from: "3.0.0"), + .package(url: "https://github.com/amzn/smoke-http.git", from: "3.0.0"), .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"), .package(url: "https://github.com/apple/swift-metrics.git", "1.0.0"..<"3.0.0"), .package(url: "https://github.com/JohnSundell/CollectionConcurrencyKit", from :"0.2.0") From f2f2449d1f6a5bc3b10a4137afdbb03a85436e86 Mon Sep 17 00:00:00 2001 From: Janujan Selvaratnam Date: Mon, 15 Jul 2024 14:22:37 -0400 Subject: [PATCH 2/3] Drop support for 5.6 but add 5.9 --- .github/workflows/codeql.yml | 1 + .github/workflows/swift.yml | 4 ++-- README.md | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 58dcd28..7f516d6 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -10,6 +10,7 @@ jobs: run-codeql-linux: name: Run CodeQL on Linux runs-on: ubuntu-latest + container: swift:5.8 permissions: security-events: write diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 56c9bf6..5b0e491 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04, ubuntu-20.04] - swift: ["5.8"] + swift: ["5.9"] runs-on: ${{ matrix.os }} steps: - uses: swift-actions/setup-swift@v1.23.0 @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - swift: ["5.7.3", "5.6.3"] + swift: ["5.8.1", "5.7.3"] runs-on: ${{ matrix.os }} steps: - uses: swift-actions/setup-swift@v1.23.0 diff --git a/README.md b/README.md index bba9f35..ad249a6 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Build - Main Branch -Swift 5.6, 5.7 and 5.8 Tested +Swift 5.7, 5.8 and 5.9 Tested Ubuntu 18.04 and 20.04 Tested CentOS 8 Tested From 5313d0d25cbfff2bd063f5813531cd8c61104837 Mon Sep 17 00:00:00 2001 From: Janujan Selvaratnam Date: Mon, 15 Jul 2024 14:25:57 -0400 Subject: [PATCH 3/3] Drop 5.9 support --- .github/workflows/codeql.yml | 1 - .github/workflows/swift.yml | 4 ++-- README.md | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 7f516d6..58dcd28 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -10,7 +10,6 @@ jobs: run-codeql-linux: name: Run CodeQL on Linux runs-on: ubuntu-latest - container: swift:5.8 permissions: security-events: write diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 5b0e491..7dd2d0b 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04, ubuntu-20.04] - swift: ["5.9"] + swift: ["5.8"] runs-on: ${{ matrix.os }} steps: - uses: swift-actions/setup-swift@v1.23.0 @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - swift: ["5.8.1", "5.7.3"] + swift: ["5.7.3"] runs-on: ${{ matrix.os }} steps: - uses: swift-actions/setup-swift@v1.23.0 diff --git a/README.md b/README.md index ad249a6..8afee2a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Build - Main Branch -Swift 5.7, 5.8 and 5.9 Tested +Swift 5.7 and 5.9 Tested Ubuntu 18.04 and 20.04 Tested CentOS 8 Tested