Skip to content

Commit

Permalink
Run sanity.sh on PR, added check for additional services (#298)
Browse files Browse the repository at this point in the history
- Run sanity.sh on PR, added check for additional services
- Don't run CI on push to non-master build
- Add AWSMacie2 target
  • Loading branch information
adam-fowler committed May 21, 2020
1 parent dadc83a commit b48111e
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Expand Up @@ -3,7 +3,7 @@ name: CI
on:
push:
branches:
- "*"
- master
pull_request:
branches:
- master
Expand Down
18 changes: 18 additions & 0 deletions .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

2 changes: 2 additions & 0 deletions Package.swift
Expand Up @@ -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"]),
Expand Down Expand Up @@ -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"),
Expand Down
13 changes: 13 additions & 0 deletions scripts/sanity.sh
Expand Up @@ -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)

Expand Down

0 comments on commit b48111e

Please sign in to comment.