Skip to content

Commit 87ca549

Browse files
committed
resolved merge conflicts for Migration PR
Signed-off-by: Aviral Asthana <[email protected]>
2 parents ef1e69a + b71e4b7 commit 87ca549

File tree

7,543 files changed

+141563
-12920
lines changed

Some content is hidden

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

7,543 files changed

+141563
-12920
lines changed

.github/ISSUE_TEMPLATE/community_member_profile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Let's recognize <@github-username> as a contributor and community member by crea
1616
- GitHub: <!-- username only -->
1717
- Twitter: <!-- handle only -->
1818
- LinkedIn: <!-- <profilename> only https://www.linkedin.com/in/<profilename> -->
19-
- Meshery Cloud: <!-- <user ID> only UUID https://meshery.layer5.io/user/<uuid> -->
19+
- Layer5 Cloud: <!-- <user ID> only UUID https://meshery.layer5.io/user/<uuid> -->
2020
- Link to profile picture:
2121

2222
A detailed explanation on how to set up a community member profile can be found in the [CONTRIBUTING.md](https://github.com/layer5io/layer5/blob/master/CONTRIBUTING.md)

.github/build/Makefile.show-help.mk

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.DEFAULT_GOAL := show-help
2+
# See <https://gist.github.com/klmr/575726c7e05d8780505a> for explanation.
3+
.PHONY: show-help
4+
show-help:
5+
@echo "$$(tput bold)Please specify a build target. The choices are:$$(tput sgr0)";echo;sed -ne"/^## /{h;s/.*//;:d" -e"H;n;s/^## //;td" -e"s/:.*//;G;s/\\n## /---/;s/\\n/ /g;p;}" ${MAKEFILE_LIST}|LC_ALL='C' sort -f|awk -F --- -v n=$$(tput cols) -v i=19 -v a="$$(tput setaf 6)" -v z="$$(tput sgr0)" '{printf"%s%*s%s ",a,-i,$$1,z;m=split($$2,w," ");l=n-i;for(j=1;j<=m;j++){l-=length(w[j])+1;if(l<= 0){l=n-i-length(w[j])-1;printf"\n%*s ",-i," ";}printf"%s ",w[j];}printf"\n";}'|more $(shell test $(shell uname) == Darwin && echo '-Xr')

.github/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ firstPRMergeComment: >
1818
&nbsp; &#9; &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; Thank you for contributing to the Layer5 community! :tada:
1919
\
2020
\
21-
![Congrats!](https://github.com/layer5io/layer5/blob/master/.github/welcome/Layer5-celebration.webp)
21+
![Congrats!](https://raw.githubusercontent.com/layer5io/layer5/master/.github/welcome/Layer5-celebration.png)
2222
\
2323
\
2424
&nbsp; &#9; &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; [Join the community](https://slack.layer5.io), if you haven't yet and please leave a :star: [star on the project](../stargazers). :smile: and

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ updates:
55
schedule:
66
interval: monthly
77
reviewers:
8-
- Nikhil-Ladha
8+

.github/label-commenter-config.yml

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ comment:
66
"
77

88
labels:
9-
- name: framework/discourse
9+
- name: issue/design required
1010
labeled:
1111
issue:
12-
body: This issue has been labeled with 'framework/discourse'. Note that prior to commencing you need to create an account [here](https://staging-discuss.layer5.io/) and then ask for the admin access. After that start contributing to the discuss forum.
12+
body: This issue has been labeled with 'design-required'. Note that prior to commencing on implementation, a design specification needs to be created and reviewed for approval. See [Creating a Functional Specification](https://docs.google.com/document/d/1RP3IWLc-MiQS-QYasqCoVuCH7--G87p5ezE5f_nOzB8/edit?usp=sharing) to create a design spec.
1313
action: open
14-
1514
- name: issue/remind
1615
labeled:
1716
issue:
@@ -20,7 +19,6 @@ labels:
2019
pr:
2120
body: Checking in... it has been awhile since we&#39;ve heard from you on this issue. Are you still working on it? Please let us know and please don&#39;t hesitate to contact a [MeshMate](https://layer5.io/community/meshmates/) or any other [community member](https://layer5.io/community/members) for assistance.
2221
action: open
23-
2422
- name: issue/dco
2523
labeled:
2624
issue:
@@ -33,3 +31,22 @@ labels:
3331
To amend the commits in this PR with your signoff using the instructions provided in the DCO check. \n\n
3432
To configure your dev environment to automatically signoff on your commits in the future, see [these instructions](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#signing-off-on-commits-developer-certificate-of-origin)."
3533
action: open
34+
- name: component/ui
35+
labeled:
36+
issue:
37+
body: This issue has been labeled with 'component/ui'. 🧰 Here are docs on [Contributing to Meshery UI](https://docs.meshery.io/project/contributing/contributing-ui). 🎨 Here is the [Meshery UI Figma File](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI?node-id=4%3A0) File. Lastly, here are docs on [Contributing to Meshery's End-to-End Tests Using Cypress](https://docs.meshery.io/project/contributing/contributing-cypress).
38+
action: open
39+
pr:
40+
body: This PR has been labeled with 'component/ui'. 🧰 Here are docs on [Contributing to Meshery UI](https://docs.meshery.io/project/contributing/contributing-ui). 🎨 Here is the [Meshery UI Figma File](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI?node-id=4%3A0) File. Lastly, here are docs on [Contributing to Meshery's End-to-End Tests Using Cypress](https://docs.meshery.io/project/contributing/contributing-cypress)
41+
action: open
42+
- name: component/mesheryctl
43+
labeled:
44+
issue:
45+
body: This issue has been labeled with 'component/mesheryctl'. Note that after making changes you need to update it in the [mesheryctl command tracker](https://docs.google.com/spreadsheets/d/1q63sIGAuCnIeDs8PeM-0BAkNj8BBgPUXhLbe1Y-318o/edit#gid=0) spreadsheet.
46+
action: open
47+
pr:
48+
body: This PR has been labeled with 'component/mesheryctl'. Note that after making changes you need to update it in the [mesheryctl command tracker](https://docs.google.com/spreadsheets/d/1q63sIGAuCnIeDs8PeM-0BAkNj8BBgPUXhLbe1Y-318o/edit#gid=0) spreadsheet.
49+
action: open
50+
# pr:
51+
# body: Hi, please note that this issue will need an approved design specification before implementation proceeds. See [Creating a Functional Specification](https://docs.google.com/document/d/1RP3IWLc-MiQS-QYasqCoVuCH7--G87p5ezE5f_nOzB8/edit?usp=sharing) to create a design spec.
52+
# action: open

.github/labeler.yml

Lines changed: 82 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,99 @@
11
area/docs:
2-
- "readme.md"
3-
- "contributing.md"
2+
- changed-files:
3+
- any-glob-to-any-file:
4+
- "readme.md"
5+
- "contributing.md"
46
area/ci:
5-
- ".github/**/*"
6-
- ".husky/**/*"
7+
- changed-files:
8+
- any-glob-to-any-file:
9+
- ".github/**/*"
10+
- ".husky/**/*"
711
area/blog:
8-
- "src/collections/blog/**/*"
9-
- "src/pages/blog/**/*"
10-
- "src/templates/blog-*.js"
12+
- changed-files:
13+
- any-glob-to-any-file:
14+
- "src/collections/blog/**/*"
15+
- "src/pages/blog/**/*"
16+
- "src/templates/blog-*.js"
1117
area/careers:
12-
- "src/collections/careers/**/*"
13-
- "src/collections/programs/**/*"
14-
- "src/templates/career-*.js"
15-
- "src/pages/careers/*"
18+
- changed-files:
19+
- any-glob-to-any-file:
20+
- "src/collections/careers/**/*"
21+
- "src/collections/programs/**/*"
22+
- "src/templates/career-*.js"
23+
- "src/pages/careers/*"
1624
area/community:
17-
- "src/collections/members/**/*"
18-
- "src/pages/community/**/*"
19-
- "src/templates/member-*.js"
25+
- changed-files:
26+
- any-glob-to-any-file:
27+
- "src/collections/members/**/*"
28+
- "src/pages/community/**/*"
29+
- "src/templates/member-*.js"
2030
area/events:
21-
- "src/collections/events/**/*"
22-
- "src/templates/event*.js"
31+
- changed-files:
32+
- any-glob-to-any-file:
33+
- "src/collections/events/**/*"
34+
- "src/templates/event*.js"
2335
area/handbook:
24-
- "src/components/HandbookCard/**/*"
25-
- "src/components/Handbook-navigation/**/*"
26-
- "src/sections/Community/Handbook/**/*"
36+
- changed-files:
37+
- any-glob-to-any-file:
38+
- "src/components/HandbookCard/**/*"
39+
- "src/components/Handbook-navigation/**/*"
40+
- "src/sections/Community/Handbook/**/*"
2741
area/landscape:
28-
- "src/sections/Landscape/**/*"
29-
- "src/components/Landscape-Table/**/*"
30-
- "src/collections/landscape/**/*"
42+
- changed-files:
43+
- any-glob-to-any-file:
44+
- "src/sections/Landscape/**/*"
45+
- "src/components/Landscape-Table/**/*"
46+
- "src/collections/landscape/**/*"
3147
area/learn:
32-
- "content-learn"
33-
- "src/components/Learn-Components/**/*"
34-
- "src/collections/service-mesh-books/**/*"
35-
- "src/collections/service-mesh-learn/**/*"
36-
- "src/collections/service-mesh-workshops/**/*"
37-
- "src/templates/book-*.js"
38-
- "src/templates/course-*.js"
39-
- "src/templates/lab-*.js"
40-
- "src/templates/learn-*.js"
41-
- "src/templates/workshop-*.js"
48+
- changed-files:
49+
- any-glob-to-any-file:
50+
- "content-learn"
51+
- "src/components/Learn-Components/**/*"
52+
- "src/collections/service-mesh-books/**/*"
53+
- "src/collections/service-mesh-learn/**/*"
54+
- "src/collections/service-mesh-workshops/**/*"
55+
- "src/templates/book-*.js"
56+
- "src/templates/course-*.js"
57+
- "src/templates/lab-*.js"
58+
- "src/templates/learn-*.js"
59+
- "src/templates/workshop-*.js"
4260
area/news:
43-
- "src/collections/news/**/*"
44-
- "src/templates/news-*.js"
61+
- changed-files:
62+
- any-glob-to-any-file:
63+
- "src/collections/news/**/*"
64+
- "src/templates/news-*.js"
4565
area/partners:
46-
- "src/collections/partners/**/*"
66+
- changed-files:
67+
- any-glob-to-any-file:
68+
- "src/collections/partners/**/*"
4769
area/resources:
48-
- "src/collections/resources/**/*"
49-
- "src/templates/resource-*.js"
70+
- changed-files:
71+
- any-glob-to-any-file:
72+
- "src/collections/resources/**/*"
73+
- "src/templates/resource-*.js"
5074
area/projects:
51-
- "src/collections/projects/**/*"
52-
- "src/pages/projects/**/*"
53-
type/core-styls:
54-
- "src/sections/app.style.js"
55-
- "src/theme/app/*"
75+
- changed-files:
76+
- any-glob-to-any-file:
77+
- "src/collections/projects/**/*"
78+
- "src/pages/projects/**/*"
79+
area/core-styles:
80+
- changed-files:
81+
- any-glob-to-any-file:
82+
- "src/sections/app.style.js"
83+
- "src/theme/app/*"
5684
area/site-config:
57-
- "gatsby-*.js"
85+
- changed-files:
86+
- any-glob-to-any-file:
87+
- "gatsby-*.js"
5888
area/packages:
59-
- "package-*.js"
89+
- changed-files:
90+
- any-glob-to-any-file:
91+
- "package-*.js"
6092
project/meshery:
61-
- "src/collections/integrations/**/*"
93+
- changed-files:
94+
- any-glob-to-any-file:
95+
- "src/collections/integrations/**/*"
6296
project/meshmap:
63-
- "src/sections/Meshmap/**/*"
97+
- changed-files:
98+
- any-glob-to-any-file:
99+
- "src/sections/Meshmap/**/*"

.github/workflows/checks.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Checks
2+
on:
3+
pull_request:
4+
branches: [ master ]
5+
types: [opened, synchronize, reopened]
6+
7+
8+
jobs:
9+
checks:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout 🛎️
13+
uses: actions/checkout@master
14+
with:
15+
persist-credentials: false
16+
fetch-depth: 1
17+
18+
- name: NPM Install
19+
run: npm install
20+
21+
- name: Build
22+
run: npm run build
23+
24+
- name: Run Eslint
25+
run: npm run checklint

.github/workflows/label-commenter.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Label Commenter
2+
3+
on:
4+
issues:
5+
types:
6+
- labeled
7+
8+
pull_request_target:
9+
types:
10+
- labeled
11+
12+
permissions:
13+
contents: read
14+
issues: write
15+
pull-requests: write
16+
17+
jobs:
18+
comment:
19+
runs-on: ubuntu-22.04
20+
steps:
21+
- name: Checkout repo 🛎️
22+
uses: actions/checkout@master
23+
with:
24+
ref: master # Set your default branch
25+
env:
26+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
- name: Label Commenter
28+
uses: peaceiris/[email protected]

.github/workflows/labeler.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
pull-requests: write
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/labeler@v4
12+
- uses: actions/labeler@v5
1313
with:
14-
repo-token: "${{ secrets.GITHUB_TOKEN }}"
14+
repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/lighthouseci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
lighthouseci:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
14-
- uses: actions/setup-node@v3
13+
- uses: actions/checkout@v4
14+
- uses: actions/setup-node@v4
1515
with:
1616
node-version: 19
1717
- run: npm install --legacy-peer-deps && npm install -g @lhci/[email protected]

0 commit comments

Comments
 (0)