Skip to content

Commit

Permalink
Merge branch 'master' into appsync
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Jun 10, 2020
2 parents 0807f61 + 9dc2e04 commit 783b682
Show file tree
Hide file tree
Showing 1,398 changed files with 45,714 additions and 10,237 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ falling prey to the [X/Y problem][2]!

- **CDK CLI Version:** <!-- Output of `cdk version` -->
- **Module Version:** <!-- Version of the module in question -->
- **Node.js Version:** <!-- Version of Node.js (run the command `node -v`) -->
- **OS:** <!-- [all | Windows 10 | OSX Mojave | Ubuntu | etc... ] -->
- **Language:** <!-- [all | TypeScript | Java | Python ] etc... ] -->

Expand Down
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/bug.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ what is the error message you are seeing?

- **CLI Version :**
- **Framework Version:**
- **Node.js Version:** <!-- Version of Node.js (run the command `node -v`) -->
- **OS :**
- **Language :**
- **Language (Version):** <!-- [all | TypeScript (3.8.3) | Java (8)| Python (3.7.3) | etc... ] -->

### Other

Expand Down
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Stackoverflow
url: https://stackoverflow.com/questions/tagged/aws-cdk
about: Please ask and answer questions here.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/doc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: "📕 Documentation issue"
name: "📕 Documentation Issue"
about: Issue in the reference documentation or developer guide
labels: feature-request, needs-triage
labels: feature-request, documentation, needs-triage
---

<!--
Expand Down
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/general-issues.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ labels: needs-triage

<!--
⚠️ Important Information
For support questions, please first reference our [documentation](https://docs.aws.amazon.com/cdk/api/latest), then use [Stackoverflow](https://stackoverflow.com/questions/ask?tags=aws-cdk). This repository's issues are intended for feature requests and bug reports.
For support questions, please first reference our [documentation](https://docs.aws.amazon.com/cdk/api/latest), then use [Stackoverflow](https://stackoverflow.com/questions/tagged/aws-cdk). This repository's issues are intended for feature requests and bug reports.
-->

### The Question
Expand All @@ -25,8 +25,9 @@ falling prey to the [X/Y problem][2]!

- **CDK CLI Version:** <!-- Output of `cdk version` -->
- **Module Version:** <!-- Version of the module in question -->
- **Node.js Version:** <!-- Version of Node.js (run the command `node -v`) -->
- **OS:** <!-- [all | Windows 10 | OSX Mojave | Ubuntu | etc... ] -->
- **Language:** <!-- [all | TypeScript | Java | Python ] etc... ] -->
- **Language (Version):** <!-- [all | TypeScript (3.8.3) | Java (8)| Python (3.7.3) | etc... ] -->


### Other information
Expand Down
5 changes: 0 additions & 5 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
### Commit Message
COMMIT/PR TITLE HERE (must follow conventionalcommits.org)

COMMIT MESSAGE HERE
### End Commit Message

----

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/close-stale-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: "Close Stale Issues"
# Controls when the action will run.
on:
schedule:
- cron: "0 * * * *"
- cron: "0 6 * * *"

jobs:
cleanup:
Expand Down
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# VSCode extension

# Store launch config in repo but not settings
.vscode/settings.json
/.favorites.json

# TypeScript incremental build states
Expand Down Expand Up @@ -32,6 +35,3 @@ cdk.out/

# Yarn error log
yarn-error.log

# Generated jest config
jest.config.gen.json
7 changes: 7 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
image: jsii/superchain
tasks:
- init: yarn build --skip-test --no-bail

vscode:
extensions:
- dbaeumer.vscode-eslint@2.1.5:9Wg0Glx/TwD8ElFBg+FKcQ==
25 changes: 7 additions & 18 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pull_request_rules:
label:
add: [ contribution/core ]
conditions:
- author~=^(eladb|RomainMuller|garnaat|nija-at|shivlaks|skinny85|rix0rrr|NGL321|Jerry-AWS|SomayaB|MrArnoldPalmer|NetaNir|iliapolo)$
- author~=^(eladb|RomainMuller|garnaat|nija-at|shivlaks|skinny85|rix0rrr|NGL321|Jerry-AWS|SomayaB|MrArnoldPalmer|NetaNir|iliapolo|njlynch)$
- -label~="contribution/core"
- name: automatic merge
actions:
Expand All @@ -16,6 +16,7 @@ pull_request_rules:
strict: smart
method: squash
strict_method: merge
commit_message: title+body
delete_head_branch: {}
conditions:
- base!=release
Expand All @@ -29,7 +30,7 @@ pull_request_rules:
- -approved-reviews-by~=author
- "#changes-requested-reviews-by=0"
- status-success~=AWS CodeBuild us-east-1
- status-success=Semantic Pull Request
#- status-success=Semantic Pull Request
- status-success=mandatory-changes
- name: automatic merge
actions:
Expand All @@ -40,6 +41,7 @@ pull_request_rules:
# Merge instead of squash
method: merge
strict_method: merge
commit_message: title+body
delete_head_branch: {}
conditions:
- -title~=(WIP|wip)
Expand All @@ -54,7 +56,7 @@ pull_request_rules:
- -approved-reviews-by~=author
- "#changes-requested-reviews-by=0"
- status-success~=AWS CodeBuild us-east-1
- status-success=Semantic Pull Request
#- status-success=Semantic Pull Request
- status-success=mandatory-changes
- name: remove stale reviews
actions:
Expand All @@ -64,20 +66,7 @@ pull_request_rules:
conditions:
- author!=dependabot[bot]
- author!=dependabot-preview[bot]
# List out all the people whose work is okay to provisionally approve
- author!=eladb
- author!=RomainMuller
- author!=garnaat
- author!=nija-at
- author!=shivlaks
- author!=skinny85
- author!=rix0rrr
- author!=NGL321
- author!=Jerry-AWS
- author!=SomayaB
- author!=MrArnoldPalmer
- author!=NetaNir
- author!=iliapolo
- label!=contribution/core
- base=master
- -merged
- -closed
Expand Down Expand Up @@ -111,5 +100,5 @@ pull_request_rules:
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- status-success~=AWS CodeBuild us-east-1
- status-success=Semantic Pull Request
#- status-success=Semantic Pull Request
- status-success=mandatory-changes
23 changes: 23 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
// Has convenient settings for attaching to a NodeJS process for debugging purposes
// that are NOT the default and otherwise every developers has to configure for
// themselves again and again.
"type": "node",
"request": "attach",
"name": "Attach to NodeJS",
// If we don't do this, every step-into into an async function call will go into
// NodeJS internals which are hard to step out of.
"skipFiles": [
"<node_internals>/**"
],
// Saves some button-pressing latency on attaching
"stopOnEntry": false
}
]
}
8 changes: 0 additions & 8 deletions .vscode/settings.json

This file was deleted.

Loading

0 comments on commit 783b682

Please sign in to comment.