Skip to content

Commit

Permalink
Merge branch 'main' into navarone/add-noticefile-generator
Browse files Browse the repository at this point in the history
  • Loading branch information
navarone-feekery authored May 21, 2024
2 parents a5d2872 + 2f8f415 commit d810700
Show file tree
Hide file tree
Showing 6 changed files with 183 additions and 0 deletions.
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve.
title: ''
labels: bug
assignees: ''

---

## Bug Description
<!--A clear and concise description of what the bug is.-->

### To Reproduce
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

## Expected behavior
<!--A clear and concise description of what you expected to happen.-->

## Screenshots
<!--If applicable, add screenshots to help explain your problem.
Include a screenshot of the browser console if it contains errors.-->

## Environment
<!--Please complete the information below if applicable-->


- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]


## Additional context
<!--If applicable, include the Crawler Webserver logs containing the error or stack trace.
Add any other context about the problem here.-->
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: Question or Discussion
url: https://discuss.elastic.co/c/search/
about: Please ask and answer questions here.
- name: Security Vulnerability
url: https://www.elastic.co/community/security
about: DO NOT file issues related to security. Instead, please follow our security policy here.
25 changes: 25 additions & 0 deletions .github/ISSUE_TEMPLATE/enhancement.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
name: Enhancement
about: It's not a bug, but some desired feature is missing
title: ''
labels: enhancement
assignees: ''

---

### Problem Description
<!--Is your feature request related to a problem? Please describe.
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->

### Proposed Solution
<!--Describe the solution you'd like
A clear and concise description of what you want to happen.-->


### Alternatives
<!--Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.-->

### Additional Context
<!--Add any other context or screenshots about the feature request here.-->
47 changes: 47 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
### Closes https://github.com/elastic/crawler/issues/###

<!--Provide a general description of the code changes in your pull request.
If the change relates to a specific issue, include the link at the top.
If this is an ad-hoc/trivial change and does not have a corresponding
issue, please describe your changes in enough details, so that reviewers
and other team members can understand the reasoning behind the pull request.-->

### Checklists

<!--You can remove unrelated items from checklists below and/or add new
items that may help during the review.-->

#### Pre-Review Checklist
- [ ] This PR does NOT contain credentials of any kind, such as API keys or username/passwords (double check `crawler.yml.example` and `elasticsearch.yml.example`)
- [ ] This PR has a meaningful title
- [ ] This PR links to all relevant GitHub issues that it fixes or partially addresses
- If there is no GitHub issue, please create it. Each PR should have a link to an issue
- [ ] this PR has a thorough description
- [ ] Covered the changes with automated tests
- [ ] Tested the changes locally
- [ ] Added a label for each target release version (example: `v0.1.0`)
- [ ] Considered corresponding documentation changes
- [ ] Contributed any configuration settings changes to the configuration reference

#### Changes Requiring Extra Attention

<!--Please call out any changes that require special attention from the
reviewers and/or increase the risk to availability or security of the
system after deployment. Remove the ones that don't apply.-->

- [ ] Security-related changes (encryption, TLS, SSRF, etc)
- [ ] New external service dependencies added.

### Related Pull Requests

<!--List any relevant PRs here or remove the section if this is a standalone PR.
* https://github.com/elastic/.../pull/123-->

### Release Note

<!--If you think this enhancement/fix should be included in the release notes,
please write a concise user-facing description of the change here.
You should also label the PR with `release_note` so the release notes
author(s) can easily look it up.-->
23 changes: 23 additions & 0 deletions .github/workflows/add-labels-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Force backport labels for main

on:
pull_request_target:
branches:
- main
types:
- opened

jobs:
add_labels:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- id: version
uses: juliangruber/read-file-action@ebfa650188272343fef925480eb4d18c5d49b925
with:
path: ./connectors/VERSION
- uses: actions-ecosystem/action-add-labels@v1
with:
labels: |
auto-backport
v${{ steps.version.outputs.content }}
42 changes: 42 additions & 0 deletions .github/workflows/backport.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Backport PR

on:
pull_request_target:
branches:
- main
types:
- labeled
- closed

jobs:
backport:
if: |
github.event.pull_request.merged == true
&& contains(github.event.pull_request.labels.*.name, 'auto-backport')
&& (
(github.event.action == 'labeled' && github.event.label.name == 'auto-backport')
|| (github.event.action == 'closed')
)
runs-on: ubuntu-latest
steps:
- name: Checkout Actions
uses: actions/checkout@v2
with:
repository: 'swiftype/kibana-github-actions'
ref: main
path: ./actions

- name: Install Actions
run: npm install --production --prefix ./actions

- name: Run Backport
uses: ./actions/backport
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
approver_token: ${{ secrets.REPO_SCOPED_TOKEN }}
auto_approve: 'true'
commit_user: elastic
commit_email: ent-search-backport@users.noreply.github.com
auto_merge: 'true'
auto_merge_method: 'squash'
manual_backport_command_template: 'backport --pr %pullNumber% --autoMerge --autoMergeMethod squash'

0 comments on commit d810700

Please sign in to comment.