From 7019a340596ea456d5d9d4d77b7c4a1b4c50b000 Mon Sep 17 00:00:00 2001 From: Nicki Stone Date: Tue, 20 Jul 2021 17:04:19 -0700 Subject: [PATCH] fix: change default branch from master to main (#265) --- .github/workflows/continuous-integration.yml | 4 ++-- .github/workflows/lint.yml | 4 ++-- CONTRIBUTING.md | 4 ++-- .../amazon/smithy/aws/swift/codegen/AWSSwiftDependency.kt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 525fcacf22b..49cb2c555ee 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -2,9 +2,9 @@ name: CI on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] workflow_dispatch: env: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c38346512c2..c4db18e59a7 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -2,9 +2,9 @@ name: Lint on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] workflow_dispatch: env: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3e82e1d68f1..6c3849574eb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,7 +23,7 @@ reported the issue. Please try to include as much information as you can. Detail ## Contributing via Pull Requests Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that: -1. You are working against the latest source on the *master* branch. +1. You are working against the latest source on the *main* branch. 2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already. 3. You open an issue to discuss any significant work - we would hate for your time to be wasted. @@ -52,6 +52,6 @@ opensource-codeofconduct@amazon.com with any additional questions or comments. ## Licensing -See the [LICENSE](https://github.com/aws-amplify/aws-sdk-swift/blob/master/LICENSE) file for our project's licensing. We will ask you confirm the licensing of your contribution. +See the [LICENSE](https://github.com/aws-amplify/aws-sdk-swift/blob/main/LICENSE) file for our project's licensing. We will ask you confirm the licensing of your contribution. We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes. diff --git a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSSwiftDependency.kt b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSSwiftDependency.kt index 4e06fc4edaf..80f4d10a24b 100644 --- a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSSwiftDependency.kt +++ b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSSwiftDependency.kt @@ -17,7 +17,7 @@ enum class AWSSwiftDependency( ) : SymbolDependencyContainer { AWS_CLIENT_RUNTIME( "AWSClientRuntime", - "master", + "main", "0.1.0", "https://github.com/awslabs/aws-sdk-swift", Resources.computeAbsolutePath("aws-sdk-swift/AWSClientRuntime", "AWSClientRuntime", "AWS_SDK_SWIFT_CI_DIR") + "/AWSClientRuntime",