Skip to content

Commit 5818ce0

Browse files
author
Vivek Vishal
authored
Merge branch 'master' into image-scroll
2 parents 90bb721 + 8882947 commit 5818ce0

2,483 files changed

Lines changed: 222049 additions & 2481 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.

.desktop-lighthouserc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module.exports = {
1313
"http://localhost/cloud-native-management/kanvas/index.html?desktop",
1414
"http://localhost/learn/learning-paths/index.html?desktop",
1515
"http://localhost/learn/service-mesh-books/index.html?desktop",
16-
"http://localhost/learn/service-mesh-workshops/index.html?desktop",
16+
"http://localhost/learn/workshops/index.html?desktop",
1717
"http://localhost/learn/index.html?desktop",
1818
"http://localhost/blog/index.html?desktop",
1919
"http://localhost/resources/index.html?desktop",

.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ Makefile
1616
README.md
1717
package.json
1818
package-lock.json
19-
19+
static/

.github/label-commenter-config.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,16 @@ labels:
4747
pr:
4848
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.
4949
action: open
50+
- name: issue/welcome
51+
labeled:
52+
issue:
53+
body: Thanks for opening this issue. A contributor will be by to give feedback soon. In the meantime, please review the [Layer5 Contributors' Welcome Guide](https://docs.google.com/document/d/17OPtDE_rdnPQxmk2Kauhm3GwXF1R5dZ3Cj8qZLKdo5E/edit?usp=sharing) and sure to join the [community Slack](https://slack.layer5.io/).
54+
action: open
55+
pr:
56+
body: >
57+
<p align="center">Thank you for contributing to the Layer5 community! :tada: </p>
58+
<p align="center"><img src="https://raw.githubusercontent.com/layer5io/layer5/master/.github/welcome/Layer5-celebration.png" width="80%" /></p><br />
59+
action: open
5060
# pr:
5161
# 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.
5262
# action: open

.github/stale.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Number of days of inactivity before an issue becomes stale
2-
daysUntilStale: 45
2+
daysUntilStale: 8
33
# Number of days of inactivity before a stale issue is closed
4-
daysUntilClose: 1
4+
daysUntilClose: 0
55
# Issues with these labels will never be considered stale
66
exemptLabels:
77
- issue/willfix

.github/workflows/build-and-deploy-site.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: Build and Deploy Site
22
on:
33
push:
44
branches: [master]
5+
paths-ignore:
6+
- .github/*
7+
58
workflow_dispatch:
69
workflow_call:
710

.github/workflows/kanvas.yml

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,47 @@
1-
name: Kanvas Snapshot Service
2-
on: # rebuild any PRs and main branch changes
3-
pull_request_target:
4-
types: [opened, synchronize, reopened]
5-
1+
name: Kanvas Screenshot Service
2+
'on':
3+
pull_request:
4+
types:
5+
- opened
6+
- synchronize
7+
- reopened
68
workflow_call:
79
inputs:
8-
fileName:
10+
fileName:
911
description: Relative file path from the root directory
1012
required: true
1113
type: string
1214
outputs:
1315
resource_url:
14-
description: "The URL of the generated resource."
15-
value: ${{ jobs.MeshMapScreenshot.outputs.resource_url }}
16-
permissions:
16+
description: The URL of the generated resource.
17+
value: ${{ jobs.KanvasScreenshot.outputs.resource_url }}
18+
permissions:
1719
actions: read
1820
contents: write
1921
security-events: write
2022
statuses: write
2123
pull-requests: write
2224
id-token: write
23-
2425
jobs:
25-
MeshMapScreenshot:
26-
runs-on: ubuntu-24.04
26+
KanvasScreenshot:
27+
runs-on: ubuntu-latest
2728
outputs:
2829
resource_url: ${{ steps.test_result.outputs.resource_url }}
2930
steps:
30-
- name: Set PR number # To comment the final status on the Pull-request opened in any repository
31+
- name: Set PR number
3132
run: |
3233
export pull_number=$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")
3334
echo "PULL_NO=$pull_number" >> $GITHUB_ENV
3435
- uses: actions/checkout@v4
35-
- uses: actions/checkout@v4 #this step would go away
36+
- uses: actions/checkout@v4
3637
with:
3738
path: action
3839
repository: layer5labs/kanvas-snapshot
3940
- id: test_result
40-
uses: layer5labs/Kanvas-Snapshot@v0.2.33
41+
uses: layer5labs/kanvas-snapshot@v0.2.34
4142
with:
42-
githubToken: ${{ secrets.GITHUB_TOKEN }} # github's personal access token example: "ghp_...."
43-
mesheryToken: ${{ secrets.MESHERY_TOKEN }} # Meshery Cloud Authentication token, signin to meshery-cloud to get one, example: ey.....
44-
prNumber: ${{ env.PULL_NO }} # auto-filled from the above step
45-
application_type: Kubernetes Manifest # your application type, could be any of three: "Kubernetes Manifest", "Docker Compose", "Helm Chart"
46-
filePath: ${{ inputs.fileName == '' && 'https://meshery.github.io/meshery.io/charts/meshery-v0.8.50.tgz' || inputs.fileName }} # relative file-path from the root directory in the github-runner env, you might require to checkout the repository as described in step 2
43+
githubToken: ${{ secrets.GITHUB_TOKEN }}
44+
mesheryToken: ${{ secrets.MESHERY_TOKEN }}
45+
prNumber: ${{ env.PULL_NO }}
46+
application_type: Kubernetes Manifest
47+
filePath: ${{ inputs.fileName == '' && 'install/deployment_yamls/k8s/meshery-deployment.yaml' || inputs.fileName }}

.github/workflows/label-triggered.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: Label Triggered Workflow
2+
on:
3+
watch:
4+
types: [started]
25

3-
on:
46
issues:
57
types:
68
- labeled
@@ -21,7 +23,6 @@ jobs:
2123
- uses: actions/checkout@master
2224
with:
2325
ref: master
24-
2526
- name: Label Commenter
2627
uses: peaceiris/actions-label-commenter@v1
2728

@@ -38,7 +39,6 @@ jobs:
3839
comment: "We are sending you an invitation to join the Layer5 GitHub Organization. :partying_face: <b>Welcome to the community! 🎉</b><br /><br />&nbsp;&nbsp;&nbsp;Be sure to :star: [star the projects](../stargazers), if you haven't already.<br />"
3940
env:
4041
INVITE_TOKEN: ${{ secrets.RELEASEDRAFTER_PAT }}
41-
4242
- name: View context attributes
4343
uses: actions/github-script@master
4444
id: set-url
@@ -47,16 +47,16 @@ jobs:
4747
const url = context.issue.url
4848
return url
4949
result-encoding: string
50-
5150
- name: Get url
5251
run: |
5352
echo "URL=${{steps.set-url.outputs.result}}" >> $GITHUB_ENV
5453
echo "ISSUE=${{steps.set-url.outputs.url}}" >> $GITHUB_ENV
55-
5654
- name: Notify slack
5755
env:
5856
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
5957
uses: pullreminders/slack-action@master
6058
with:
6159
args: '{\"channel\":\"CF9RK4H89\",\"text\":\"An invitation to join the layer5io GitHub org has been sent\"}'
6260
# to the author of: ${{env.URL}}\"}'
61+
62+

.github/workflows/slack.yml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,36 @@
11
name: Slack Notify
2-
on:
2+
3+
on:
34
watch:
45
types: [started]
6+
issues:
7+
types: [labeled]
8+
59
jobs:
610
star-notify:
711
if: github.event_name == 'watch'
812
name: Notify Slack on star
913
runs-on: ubuntu-latest
1014
steps:
11-
- name: Get current star count
12-
run: |
13-
echo "STARS=$(curl --silent 'https://api.github.com/repos/${{github.repository}}' -H 'Accept: application/vnd.github.preview' | jq '.stargazers_count')" >> $GITHUB_ENV
14-
- name: Notify slack
15-
env:
16-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
17-
uses: pullreminders/slack-action@master
18-
with:
19-
args: '{\"channel\":\"CSK7N9TGX\",\"text\":\"${{ github.actor }} just starred ${{github.repository}}! (https://github.com/${{github.repository}}/stargazers) Total ⭐️: ${{env.STARS}}\"}'
15+
- name: Get current star count
16+
run: |
17+
echo "STARS=$(curl --silent 'https://api.github.com/repos/${{ github.repository }}' -H 'Accept: application/vnd.github.preview' | jq '.stargazers_count')" >> $GITHUB_ENV
18+
- name: Notify Slack
19+
env:
20+
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
21+
uses: pullreminders/slack-action@master
22+
with:
23+
args: '{\"channel\":\"CSK7N9TGX\",\"text\":\"${{ github.actor }} just starred ${{ github.repository }}! (https://github.com/${{ github.repository }}/stargazers) Total ⭐️: ${{ env.STARS }}\"}'
24+
2025
good-first-issue-notify:
21-
if: github.event_name == 'issues' && github.event.label.name == 'good first issue' || github.event.label.name == 'first-timers-only'
26+
if: github.event_name == 'issues' && (github.event.label.name == 'good first issue' || github.event.label.name == 'first-timers-only')
2227
name: Notify Slack for new good-first-issue
2328
runs-on: ubuntu-latest
2429
steps:
25-
- name: Notify slack
30+
- name: Notify Slack
2631
env:
2732
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
2833
uses: pullreminders/slack-action@master
2934
with:
30-
args: '{\"channel\":\"C019426UBNY\",\"text\":\"A good first issue label was just added to ${{github.event.issue.html_url}}.\"}'
35+
args: '{\"channel\":\"C019426UBNY\",\"type\":\"section\",\"text\":\":new: Good first issue up for grabs: ${{ github.event.issue.title }} - ${{ github.event.issue.html_url }} \"}'
36+

.github/workflows/tweet-issue.yml

Lines changed: 0 additions & 45 deletions
This file was deleted.

.husky/pre-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22
. "$(dirname "$0")/_/husky.sh"
33

4-
npm run checklint
4+
npm run lint

0 commit comments

Comments
 (0)