Skip to content

Commit 811123a

Browse files
authored
Merge branch 'master' into patch-2
Signed-off-by: mahadevan <[email protected]>
2 parents 827c1f8 + 39c884d commit 811123a

File tree

8 files changed

+2367
-1754
lines changed

8 files changed

+2367
-1754
lines changed

.github/workflows/kanvas.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
path: action
4848
repository: layer5labs/kanvas-snapshot
4949
- id: test_result
50-
uses: layer5labs/[email protected].33
50+
uses: layer5labs/[email protected].41
5151
with:
5252
githubToken: ${{ secrets.GITHUB_TOKEN }} # github's personal access token example: "ghp_...."
5353
mesheryToken: ${{ secrets.MESHERY_TOKEN }} # Meshery Cloud Authentication token, signin to meshery-cloud to get one, example: ey.....
@@ -56,4 +56,4 @@ jobs:
5656
skipComment: true
5757
designID: ${{ inputs.contentID }} # relative file-path from the root directory in the github-runner env, you might require to checkout the repository as described in step 2
5858
assetLocation: ${{ inputs.assetLocation }}
59-
email: ${{ inputs.email }}
59+
email: ${{ inputs.email }}

.github/workflows/slack.yml

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,41 @@
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
9-
runs-on: ubuntu-24.04
13+
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+
19+
- name: Notify Slack
20+
uses: slackapi/[email protected]
21+
with:
22+
method: chat.postMessage
23+
token: ${{ secrets.SLACK_BOT_TOKEN }}
24+
payload: |
25+
channel: CSK7N9TGX
26+
type: "mrkdwn"
27+
text: "<https://github.com/${{ github.actor }}|${{ github.actor }}> just starred <https://github.com/${{ github.repository }}/stargazers|${{ github.repository }}> bringing the total ⭐️ count up to: ${{ env.STARS }}"
28+
2029
good-first-issue-notify:
21-
if: github.event_name == 'issues' && github.event.label.name == 'good first issue' || github.event.label.name == 'first-timers-only'
30+
if: github.event_name == 'issues' && (github.event.label.name == 'good first issue' || github.event.label.name == 'first-timers-only')
2231
name: Notify Slack for new good-first-issue
23-
runs-on: ubuntu-24.04
32+
runs-on: ubuntu-latest
2433
steps:
25-
- name: Notify slack
26-
env:
27-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
28-
uses: pullreminders/slack-action@master
34+
- name: Notify Slack
35+
uses: slackapi/[email protected]
2936
with:
30-
args: '{\"channel\":\"C019426UBNY\",\"text\":\"A good first issue label was just added to ${{github.event.issue.html_url}}.\"}'
37+
method: chat.postMessage
38+
token: ${{ secrets.SLACK_BOT_TOKEN }}
39+
payload: |
40+
channel: C019426UBNY
41+
text: ":new: Good first issue up for grabs: <${{ github.event.issue.html_url }}|${{ github.event.issue.title }}>"

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ alt="Meshery Logo" width="70%" /></picture></a><br /><br /></p>
77
<p align="center">
88
<a href="https://hub.docker.com/r/meshery/meshery" alt="Docker pulls">
99
<img src="https://img.shields.io/docker/pulls/layer5/meshery.svg" /></a>
10-
<a href="https://github.com/issues?q=is%3Aopen+is%3Aissue+archived%3Afalse+org%3Ameshery+org%3Aservice-mesh-performance+org%3Aservice-mesh-patterns+org%3A+label%3A%22help+wanted%22+" alt="GitHub issues by-label">
10+
<a href="https://github.com/issues?q=is%3Aopen%20is%3Aissue%20archived%3Afalse%20(repo%3Ameshery%2Fmeshery%20OR%20repo%3Aservice-mesh-performance%2Fservice-mesh-performance%20OR%20repo%3Aservice-mesh-patterns%2Fservice-mesh-patterns)%20label%3A%22help%20wanted%22" alt="GitHub issues by-label">
1111
<img src="https://img.shields.io/github/issues/meshery/meshery/help%20wanted.svg?color=informational" /></a>
1212
<a href="https://github.com/meshery/meshery/blob/master/LICENSE" alt="LICENSE">
1313
<img src="https://img.shields.io/github/license/meshery/meshery?color=brightgreen" /></a>
@@ -84,7 +84,9 @@ Anyone can create new components. When they do, they can use a predefined shape
8484
Our projects are community-built and welcome collaboration. 👍 Be sure to see the <a href="https://layer5.io/community/newcomers">Contributor Journey Map</a> and <a href="https://meshery.io/community#handbook">Community Handbook</a> for a tour of resources available to you and the <a href="https://layer5.io/community/handbook/repository-overview">Repository Overview</a> for a cursory description of repository by technology and programming language. Jump into community <a href="https://slack.meshery.io">Slack</a> or <a href="https://meshery.io/community#discussion-forums">discussion forum</a> to participate.
8585

8686
<p style="clear:both;">
87-
<a href ="https://meshery.io/community"><img alt="MeshMates" src=".github/assets/images/readme/community-sign.png" style="margin-right:36px; margin-bottom:7px;" width="140px" align="left" /></a>
87+
88+
<a href ="https://meshery.io/community/meshmates"><img alt="MeshMates" src="https://meshery.io/assets/images/logos/meshmate-light.svg" style="margin-right:36px; margin-bottom:7px;" width="140px" align="left" /></a>
89+
8890
<h3>Find your MeshMate</h3>
8991

9092
<p>MeshMates are experienced community members, who will help you learn your way around, discover live projects, and expand your community network. Connect with a Meshmate today!</p>
@@ -119,7 +121,7 @@ Learn more about the <a href="https://meshery.io/community#meshmates">MeshMates<
119121
</div>
120122
<br /><br />
121123
<p align="left">
122-
&nbsp;&nbsp;&nbsp;&nbsp; <i>Not sure where to start?</i> Grab an open issue with the <a href="https://github.com/issues?q=is%3Aopen+is%3Aissue+archived%3Afalse+org%3Alayer5io+org%3Ameshery+org%3Alayer5labs+org%3Aservice-mesh-performance+org%3Aservice-mesh-patterns+label%3A%22help+wanted%22+">help-wanted label</a>.
124+
&nbsp;&nbsp;&nbsp;&nbsp; <i>Not sure where to start?</i> Grab an open issue with the <a href="https://github.com/issues?q=is%3Aopen%20is%3Aissue%20archived%3Afalse%20(repo%3Alayer5io%2Flayer5%20OR%20repo%3Ameshery%2Fmeshery%20OR%20repo%3Aservice-mesh-performance%2Fservice-mesh-performance%20OR%20repo%3Aservice-mesh-patterns%2Fservice-mesh-patterns)%20label%3A%22help%20wanted%22">help-wanted label</a>.
123125
</p>
124126
<br /><br />
125127

site/gatsby-browser.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import "./src/fonts.css";

0 commit comments

Comments
 (0)