Skip to content

Commit faf8891

Browse files
authored
Merge branch 'main' into bot/11422-clickable-indices
2 parents 8f8ff36 + 1076784 commit faf8891

1,070 files changed

Lines changed: 108027 additions & 72442 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintrc.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,6 @@ module.exports = {
435435
{
436436
files: [
437437
'packages/osd-ui-framework/**/*.test.js',
438-
'packages/osd-ui-framework/Gruntfile.js',
439438
'packages/osd-opensearch/src/**/*.js',
440439
'packages/osd-interpreter/tasks/**/*.js',
441440
'packages/osd-interpreter/src/plugin/**/*.js',

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @ananzh @kavilla @AMoo-Miki @ashwin-pc @abbyhu2000 @zengyan-amazon @zhongnansu @ZilongX @Flyingliuhub @bandinib-amzn @SuZhou-Joe @ruanyl @xinruiba @zhyuanqi @mengweieric @LDrago27 @virajsanghvi @sejli @joshuali925 @huyaboo @angle943 @Maosaic @wanglam @d-buckner @ps48 @TackAdam @ruchidh @sumukhswamy @paulstn @Qxisylolo @yubonluo
1+
* @ananzh @kavilla @AMoo-Miki @ashwin-pc @abbyhu2000 @zengyan-amazon @zhongnansu @ZilongX @Flyingliuhub @bandinib-amzn @SuZhou-Joe @ruanyl @xinruiba @zhyuanqi @mengweieric @LDrago27 @virajsanghvi @sejli @joshuali925 @huyaboo @angle943 @Maosaic @wanglam @d-buckner @ps48 @TackAdam @ruchidh @sumukhswamy @paulstn @Qxisylolo @yubonluo @FriedhelmWS

.github/workflows/add-untriaged.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@ on:
44
issues:
55
types: [opened, reopened, transferred]
66

7+
permissions:
8+
issues: write
9+
710
jobs:
811
apply-label-if-not-collaborator:
912
runs-on: ubuntu-latest
1013
steps:
1114
- name: Check if issue author is a collaborator
1215
id: check-collaborator
13-
uses: actions/github-script@v6
16+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
1417
with:
1518
script: |
1619
const issueAuthor = context.payload.issue.user.login;
@@ -56,7 +59,7 @@ jobs:
5659
5760
- name: Apply label if not a collaborator
5861
if: steps.check-collaborator.outputs.is_collaborator == 'false'
59-
uses: actions/github-script@v6
62+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
6063
with:
6164
script: |
6265
console.log('Attempting to add "untriaged" label');

.github/workflows/backport.yml

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,12 @@
1+
---
12
name: Backport
23
on:
34
pull_request_target:
4-
types:
5-
- closed
6-
- labeled
5+
types: [closed, labeled]
76

87
jobs:
98
backport:
10-
runs-on: ubuntu-latest
11-
permissions:
12-
contents: write
13-
pull-requests: write
14-
name: Backport
15-
# Only react to merged PRs for security reasons.
16-
# See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
17-
if: >
18-
github.event.pull_request.merged
19-
&& (
20-
github.event.action == 'closed'
21-
|| (
22-
github.event.action == 'labeled'
23-
&& contains(github.event.label.name, 'backport')
24-
)
25-
)
26-
steps:
27-
- name: GitHub App token
28-
id: github_app_token
29-
uses: tibdex/github-app-token@v1.5.0
30-
with:
31-
app_id: ${{ secrets.APP_ID }}
32-
private_key: ${{ secrets.APP_PRIVATE_KEY }}
33-
# opensearch-trigger-bot installation ID
34-
installation_id: 22958780
35-
36-
- name: Backport
37-
uses: VachaShah/backport@v2.2.0
38-
with:
39-
github_token: ${{ steps.github_app_token.outputs.token }}
40-
head_template: backport/backport-<%= number %>-to-<%= base %>
41-
labels_template: "<%= JSON.stringify([...labels, 'autocut']) %>"
42-
failure_labels: 'failed backport'
9+
if: github.repository == 'opensearch-project/OpenSearch-Dashboards'
10+
uses: opensearch-project/opensearch-build/.github/workflows/backport-pr.yml@main
11+
secrets:
12+
OPENSEARCH_CI_BOT_TOKEN: ${{ secrets.OPENSEARCH_CI_BOT_TOKEN }}

0 commit comments

Comments
 (0)