Skip to content

Commit f3d8cfd

Browse files
Merge branch 'master' into consistent-border
2 parents a927ca4 + 5fc7c21 commit f3d8cfd

14 files changed

Lines changed: 414 additions & 326 deletions

File tree

.github/labeler.yml

Lines changed: 13 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,26 @@
11
area/docs:
22
- changed-files:
33
- any-glob-to-any-file:
4-
- "docs/**/*"
4+
- "*.md"
5+
- "site/**/*.md"
6+
57
area/ci:
68
- changed-files:
79
- any-glob-to-any-file:
810
- ".github/**/*"
11+
912
component/ui:
1013
- changed-files:
1114
- any-glob-to-any-file:
12-
- "ui/**/*"
13-
- "provider-ui/**/*"
14-
component/server:
15-
- changed-files:
16-
- any-glob-to-any-file:
17-
- "server/**/*"
18-
area/models:
19-
- changed-files:
20-
- any-glob-to-any-file:
21-
- "server/meshmodel/**/*"
22-
component/mesheryctl:
23-
- changed-files:
24-
- any-glob-to-any-file:
25-
- "mesheryctl/**/*"
15+
- "site/src/**/*"
16+
- "site/gatsby-*.js"
17+
- "site/package.json"
18+
- "site/package-lock.json"
19+
2620
component/extensions:
2721
- changed-files:
2822
- any-glob-to-any-file:
29-
- "install/docker-extension/**/*"
30-
- "ui/components/ExtensionSandbox.js"
31-
- "ui/remote-component.config.js"
32-
area/lifecycle:
33-
- changed-files:
34-
- any-glob-to-any-file:
35-
- "install/*"
36-
kubernetes:
37-
- changed-files:
38-
- any-glob-to-any-file:
39-
- "install/deployment_yamls/*"
40-
- "install/kubernetes/**/*"
41-
framework/helm:
42-
- changed-files:
43-
- any-glob-to-any-file:
44-
- "install/kubernetes/helm/**/*"
45-
framework/graphql:
46-
- changed-files:
47-
- any-glob-to-any-file:
48-
- "server/internal/graphql/*"
49-
component/database:
50-
- changed-files:
51-
- any-glob-to-any-file:
52-
- "server/internal/sql/*"
53-
playground:
54-
- changed-files:
55-
- any-glob-to-any-file:
56-
- "install/playground/**/*"
57-
opa:
58-
- changed-files:
59-
- any-glob-to-any-file:
60-
- "*.rego"
61-
tests:
62-
- changed-files:
63-
- any-glob-to-any-file:
64-
- "ui/tests/**/*"
23+
- "build/**/*"
24+
- "site/**/*"
25+
- "Makefile"
26+
- "script.sh"

.github/release-drafter.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ categories:
2727
- 'area/ci'
2828
- 'area/tests'
2929
- title: 📖 Documentation
30-
label: area/docs
30+
labels: 'area/docs'
3131
- title: 🔒 Security
32-
label: security
32+
labels: 'security'
3333
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
3434
template: |
3535
## What's New

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
run: bash ./script.sh
2424

2525
- name: Upload files
26-
uses: actions/upload-artifact@master
26+
uses: actions/upload-artifact@v4
2727
with:
2828
name: public-dir
2929
path: ./public-dir.zip

.github/workflows/labeler.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
permissions:
88
contents: read
99
pull-requests: write
10-
runs-on: ubuntu-24.04
10+
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/labeler@v5
12+
- uses: actions/labeler@v6
1313
with:
1414
repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/preview-site.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ jobs:
1515
uses: actions/checkout@master
1616

1717
- name: Download Site dir
18-
uses: dawidd6/action-download-artifact@v6
18+
uses: actions/download-artifact@v4
1919
with:
20-
github_token: ${{ secrets.RELEASE_NOTES_PAT }}
21-
workflow: build-and-preview-site.yml
22-
run_id: ${{ github.event.workflow_run.id }}
23-
name: site-dir
20+
name: public-dir
21+
github-token: ${{ secrets.RELEASE_NOTES_PATN }}
22+
repository: ${{ github.event.workflow_run.repository.full_name }}
23+
run-id: ${{ github.event.workflow_run.id }}
2424

2525
- name: Unzip Site
2626
run: |
2727
rm -rf ./docs/_site
28-
unzip site-dir.zip
29-
rm -f site-dir.zip
28+
unzip public-dir.zip
29+
rm -f public-dir.zip
3030
3131
- name: Deploy to Netlify
3232
id: netlify
@@ -43,7 +43,7 @@ jobs:
4343
- name: Comment Deploy URL
4444
uses: ./.github/actions/comment-preview-on-pr
4545
with:
46-
token: ${{ secrets.RELEASE_NOTES_PAT }}
46+
token: ${{ secrets.RELEASE_NOTES_PATN }}
4747
deploy_url: "${{ steps.netlify.outputs.deploy-url }}"
4848

4949

site/gatsby-config.js

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,22 @@
44
module.exports = {
55
siteMetadata: {
66
title: "Meshery Shape Builder",
7-
siteUrl: "https://shapes.meshery.io"
7+
siteUrl: "https://shapes.meshery.io",
88
},
9-
plugins: ["gatsby-plugin-styled-components"]
10-
};
9+
plugins: [
10+
"gatsby-plugin-styled-components",
11+
{
12+
resolve: "gatsby-plugin-manifest",
13+
options: {
14+
name: "Meshery Shape Builder",
15+
short_name: "Shapes",
16+
start_url: "/",
17+
background_color: "#3c494f",
18+
theme_color: "#00b39f",
19+
display: "minimal-ui",
20+
icon: "src/assets/images/favicon.png",
21+
},
22+
},
23+
],
24+
};
25+

0 commit comments

Comments
 (0)