Skip to content
This repository was archived by the owner on Dec 2, 2020. It is now read-only.

Commit 31d59c0

Browse files
committed
chore: switch to mainline as default branch
1 parent af70b69 commit 31d59c0

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

.mergify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pull_request_rules:
22
- name: Automatically merge on CI success and review approval
33
conditions:
4-
- base=master
4+
- base=mainline
55
- "#approved-reviews-by>=1"
66
- approved-reviews-by=@awslabs/developer-experience
77
- -approved-reviews-by~=author
@@ -23,7 +23,7 @@ pull_request_rules:
2323

2424
- name: Automatically approve and merge Dependabot PRs
2525
conditions:
26-
- base=master
26+
- base=mainline
2727
- author=dependabot[bot]
2828
- label=dependencies
2929
- status-success=Build Docker image from Dockerfile

CONTRIBUTING.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# Contributing Guidelines
22

3-
Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional
3+
Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional
44
documentation, we greatly value feedback and contributions from our community.
55

6-
Please read through this document before submitting any issues or pull requests to ensure we have all the necessary
6+
Please read through this document before submitting any issues or pull requests to ensure we have all the necessary
77
information to effectively respond to your bug report or contribution.
88

99

1010
## Reporting Bugs/Feature Requests
1111

1212
We welcome you to use the GitHub issue tracker to report bugs or suggest features.
1313

14-
When filing an issue, please check [existing open](https://github.com/awslabs/aws-lambda-aws-lambda-container-image-converter/issues), or [recently closed](https://github.com/awslabs/aws-lambda-aws-lambda-container-image-converter/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already
14+
When filing an issue, please check [existing open](https://github.com/awslabs/aws-lambda-aws-lambda-container-image-converter/issues), or [recently closed](https://github.com/awslabs/aws-lambda-aws-lambda-container-image-converter/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already
1515
reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
1616

1717
* A reproducible test case or series of steps
@@ -23,7 +23,7 @@ reported the issue. Please try to include as much information as you can. Detail
2323
## Contributing via Pull Requests
2424
Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
2525

26-
1. You are working against the latest source on the *master* branch.
26+
1. You are working against the latest source on the *mainline* branch.
2727
2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
2828
3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
2929

@@ -36,17 +36,17 @@ To send us a pull request, please:
3636
5. Send us a pull request, answering any default questions in the pull request interface.
3737
6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
3838

39-
GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
39+
GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
4040
[creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
4141

4242

4343
## Finding contributions to work on
44-
Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/awslabs/aws-lambda-aws-lambda-container-image-converter/labels/help%20wanted) issues is a great place to start.
44+
Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/awslabs/aws-lambda-aws-lambda-container-image-converter/labels/help%20wanted) issues is a great place to start.
4545

4646

4747
## Code of Conduct
48-
This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
49-
For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
48+
This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
49+
For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
5050
[email protected] with any additional questions or comments.
5151

5252

@@ -56,6 +56,6 @@ If you discover a potential security issue in this project we ask that you notif
5656

5757
## Licensing
5858

59-
See the [LICENSE](https://github.com/awslabs/aws-lambda-aws-lambda-container-image-converter/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
59+
See the [LICENSE](https://github.com/awslabs/aws-lambda-aws-lambda-container-image-converter/blob/mainline/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
6060

6161
We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## AWS Lambda Container Image Converter
22

3-
[![Build Status](https://travis-ci.org/awslabs/aws-lambda-container-image-converter.svg?branch=master)](https://travis-ci.org/awslabs/aws-lambda-container-image-converter)
3+
[![Build Status](https://travis-ci.org/awslabs/aws-lambda-container-image-converter.svg?branch=mainline)](https://travis-ci.org/awslabs/aws-lambda-container-image-converter)
44

55
This container image converter tool (img2lambda) extracts an AWS Lambda function deployment package from a container image (such as a Docker image).
66
It also extracts AWS Lambda layers from a container image, and publishes them as new layer versions to Lambda.

img2lambda/version/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
package version
44

55
// Version indicates which version of the binary is running.
6-
var Version = "master"
6+
var Version = "mainline"
77

88
// GitCommitSHA indicates which git shorthash the binary was built off of
99
var GitCommitSHA string

0 commit comments

Comments
 (0)