diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8215b5f11b7..1cf3a20735c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - "*" + - master pull_request: branches: - master diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml new file mode 100644 index 00000000000..4aacd0b8453 --- /dev/null +++ b/.github/workflows/sanity.yml @@ -0,0 +1,18 @@ +name: Sanity Check + +on: + pull_request: + branches: + - master + +jobs: + macos: + runs-on: macOS-latest + steps: + - name: Checkout + uses: actions/checkout@v1 + with: + fetch-depth: 1 + - name: run script + run: ./scripts/sanity.sh + diff --git a/Package.swift b/Package.swift index 93444e37509..30f062770ab 100644 --- a/Package.swift +++ b/Package.swift @@ -152,6 +152,7 @@ let package = Package( .library(name: "AWSMTurk", targets: ["AWSMTurk"]), .library(name: "AWSMachineLearning", targets: ["AWSMachineLearning"]), .library(name: "AWSMacie", targets: ["AWSMacie"]), + .library(name: "AWSMacie2", targets: ["AWSMacie2"]), .library(name: "AWSManagedBlockchain", targets: ["AWSManagedBlockchain"]), .library(name: "AWSMarketplaceCatalog", targets: ["AWSMarketplaceCatalog"]), .library(name: "AWSMarketplaceCommerceAnalytics", targets: ["AWSMarketplaceCommerceAnalytics"]), @@ -380,6 +381,7 @@ let package = Package( .target(name: "AWSMTurk", dependencies: ["AWSSDKSwiftCore"], path: "./Sources/AWSSDKSwift/Services/MTurk"), .target(name: "AWSMachineLearning", dependencies: ["AWSSDKSwiftCore"], path: "./Sources/AWSSDKSwift/Services/MachineLearning"), .target(name: "AWSMacie", dependencies: ["AWSSDKSwiftCore"], path: "./Sources/AWSSDKSwift/Services/Macie"), + .target(name: "AWSMacie2", dependencies: ["AWSSDKSwiftCore"], path: "./Sources/AWSSDKSwift/Services/Macie2"), .target(name: "AWSManagedBlockchain", dependencies: ["AWSSDKSwiftCore"], path: "./Sources/AWSSDKSwift/Services/ManagedBlockchain"), .target(name: "AWSMarketplaceCatalog", dependencies: ["AWSSDKSwiftCore"], path: "./Sources/AWSSDKSwift/Services/MarketplaceCatalog"), .target(name: "AWSMarketplaceCommerceAnalytics", dependencies: ["AWSSDKSwiftCore"], path: "./Sources/AWSSDKSwift/Services/MarketplaceCommerceAnalytics"), diff --git a/scripts/sanity.sh b/scripts/sanity.sh index 168f8931e3c..c62784dad54 100755 --- a/scripts/sanity.sh +++ b/scripts/sanity.sh @@ -16,11 +16,24 @@ set -eu here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +function check_all_services_in_package() { + for folder in $here/../Sources/AWSSDKSwift/Services/*; do + service=$(basename $folder) + if [ -z "$(grep ".target(name: \"AWS$service" $here/../Package.swift)" ]; then + echo "$service is not in Package.swift" + exit -1 + fi + done +} + function replace_acceptable_years() { # this needs to replace all acceptable forms with 'YEARS' sed -e 's/20[12][78901]-20[12][8901]/YEARS/' -e 's/20[12][8901]/YEARS/' -e '/^#!/ d' } +echo "=> Checking services in Package.swift... " +check_all_services_in_package + printf "=> Checking license headers... " tmp=$(mktemp /tmp/.aws-sdk-swift-core-sanity_XXXXXX)