From adf9a5df6da0b1a654bf9ce58813b394f4adf09f Mon Sep 17 00:00:00 2001 From: "chris.agocs" Date: Thu, 10 Dec 2020 10:57:44 -0500 Subject: [PATCH] master-main --- .github/pull_request_template.md | 2 +- CONTRIBUTING.md | 2 +- README.md | 4 ++-- scripts/publish_prod.sh | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 75b48cec..d1181e39 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,4 +1,4 @@ - + ### What does this PR do? diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6941aa58..8f394e3e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,6 +16,6 @@ Make your change, update tests and ensure the tests pass (install Docker if you Push to your fork and [submit a pull request][pr]. -[pr]: https://github.com/your-username/datadog-lambda-python/compare/DataDog:master...master +[pr]: https://github.com/your-username/datadog-lambda-python/compare/DataDog:main...main At this point you're waiting on us. We may suggest some changes or improvements or alternatives. diff --git a/README.md b/README.md index e2e47cd8..633e1935 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![PyPI](https://img.shields.io/pypi/v/datadog-lambda)](https://pypi.org/project/datadog-lambda/) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/datadog-lambda) [![Slack](https://img.shields.io/badge/slack-%23serverless-blueviolet?logo=slack)](https://datadoghq.slack.com/channels/serverless/) -[![License](https://img.shields.io/badge/license-Apache--2.0-blue)](https://github.com/DataDog/datadog-lambda-python/blob/master/LICENSE) +[![License](https://img.shields.io/badge/license-Apache--2.0-blue)](https://github.com/DataDog/datadog-lambda-python/blob/main/LICENSE) Datadog Lambda Library for Python (2.7, 3.6, 3.7 and 3.8) enables enhanced Lambda metrics, distributed tracing, and custom metric submission from AWS Lambda functions. @@ -40,7 +40,7 @@ Check out the official documentation on [Datadog Lambda enhanced metrics](https: ### DD_FLUSH_TO_LOG -Set to `true` (recommended) to send custom metrics asynchronously (with no added latency to your Lambda function executions) through CloudWatch Logs with the help of [Datadog Forwarder](https://github.com/DataDog/datadog-serverless-functions/tree/master/aws/logs_monitoring). Defaults to `false`. If set to `false`, you also need to set `DD_API_KEY` and `DD_SITE`. +Set to `true` (recommended) to send custom metrics asynchronously (with no added latency to your Lambda function executions) through CloudWatch Logs with the help of [Datadog Forwarder](https://github.com/DataDog/datadog-serverless-functions/tree/main/aws/logs_monitoring). Defaults to `false`. If set to `false`, you also need to set `DD_API_KEY` and `DD_SITE`. ### DD_API_KEY diff --git a/scripts/publish_prod.sh b/scripts/publish_prod.sh index 1e11f08c..227a1f50 100755 --- a/scripts/publish_prod.sh +++ b/scripts/publish_prod.sh @@ -7,8 +7,8 @@ set -e BRANCH=$(git rev-parse --abbrev-ref HEAD) echo $BRANCH -if [ $BRANCH != "master" ]; then - echo "Not on master, aborting" +if [ $BRANCH != "main" ]; then + echo "Not on main, aborting" exit 1 fi @@ -79,7 +79,7 @@ echo "Publishing layers to AWS regions..." echo echo 'Pushing updates to github' MINOR_VERSION=$(echo $NEW_VERSION | cut -d '.' -f 2) -git push origin master +git push origin main git push origin "refs/tags/v$MINOR_VERSION"