Skip to content

Commit d6b34d9

Browse files
amitamrutiyaamitamrutiya
authored
Merge branch 'master' into amit/catalog-detail
2 parents 240567a + f88d007 commit d6b34d9

File tree

2 files changed

+127
-3
lines changed

2 files changed

+127
-3
lines changed

‎.github/workflows/bump-meshery-version.yml

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
name: Bump Meshery, Meshery Extensions and Meshery Cloud
2+
3+
on:
4+
release:
5+
types: [published]
6+
7+
jobs:
8+
bump-meshery:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout Meshery code
12+
uses: actions/checkout@v4
13+
with:
14+
repository: meshery/meshery
15+
fetch-depth: 1
16+
token: ${{ secrets.RELEASEDRAFTER_PAT }}
17+
- uses: actions/setup-node@v4
18+
with:
19+
node-version: 18
20+
cache: "npm"
21+
cache-dependency-path: '**/package-lock.json'
22+
- name: Make changes to pull request
23+
working-directory: ui
24+
run: npm install @layer5/sistent@latest
25+
- name: Create Pull Request
26+
id: cpr
27+
uses: peter-evans/create-pull-request@v7
28+
with:
29+
token: ${{ secrets.RELEASEDRAFTER_PAT }}
30+
commit-message: Bump sistent ${{ github.event.release.tag_name }} dependencies
31+
committer: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
32+
author: "l5io"
33+
signoff: true
34+
branch: bump-sistent-bot
35+
delete-branch: true
36+
title: '[Chore]: Bump ${{ github.event.release.name }}'
37+
add-paths: |
38+
ui/package.json
39+
ui/package-lock.json
40+
body: |
41+
Update to Sistent ${{ github.event.release.tag_name }}
42+
43+
_This pull request has been auto-generated by [l5io](http://github.com/l5io)_
44+
assignees: l5io
45+
draft: false
46+
bump-meshery-extensions:
47+
runs-on: ubuntu-latest
48+
steps:
49+
- name: Checkout Meshery Extensions code
50+
uses: actions/checkout@v4
51+
with:
52+
repository: layer5labs/meshery-extensions
53+
fetch-depth: 1
54+
token: ${{ secrets.RELEASEDRAFTER_PAT }}
55+
- uses: actions/setup-node@v4
56+
with:
57+
node-version: 18
58+
cache: "npm"
59+
cache-dependency-path: '**/package-lock.json'
60+
- name: Make changes to pull request
61+
working-directory: meshmap
62+
run: npm install @layer5/sistent@latest
63+
- name: Create Pull Request
64+
id: cpr
65+
uses: peter-evans/create-pull-request@v7
66+
with:
67+
token: ${{ secrets.RELEASEDRAFTER_PAT }}
68+
commit-message: Bump sistent ${{ github.event.release.tag_name }} dependencies
69+
committer: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
70+
author: "l5io"
71+
signoff: true
72+
branch: bump-sistent-bot
73+
delete-branch: true
74+
title: '[Chore]: Bump ${{ github.event.release.name }}'
75+
add-paths: |
76+
meshmap/package.json
77+
meshmap/package-lock.json
78+
body: |
79+
Update to Sistent ${{ github.event.release.tag_name }}
80+
81+
_This pull request has been auto-generated by [l5io](http://github.com/l5io)_
82+
assignees: l5io
83+
draft: false
84+
bump-meshery-cloud:
85+
runs-on: ubuntu-latest
86+
steps:
87+
- name: Checkout Meshery Extensions code
88+
uses: actions/checkout@v4
89+
with:
90+
repository: layer5io/meshery-cloud
91+
fetch-depth: 1
92+
token: ${{ secrets.RELEASEDRAFTER_PAT }}
93+
- uses: actions/setup-node@v4
94+
with:
95+
node-version: 18
96+
cache: "npm"
97+
cache-dependency-path: '**/package-lock.json'
98+
- name: Make changes to pull request
99+
working-directory: ui
100+
run: npm install @layer5/sistent@latest
101+
- name: Create Pull Request
102+
id: cpr
103+
uses: peter-evans/create-pull-request@v7
104+
with:
105+
token: ${{ secrets.RELEASEDRAFTER_PAT }}
106+
commit-message: Bump sistent ${{ github.event.release.tag_name }} dependencies
107+
committer: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
108+
author: "l5io"
109+
signoff: true
110+
branch: bump-sistent-bot
111+
delete-branch: true
112+
title: '[Chore]: Bump ${{ github.event.release.name }}'
113+
add-paths: |
114+
ui/package.json
115+
ui/package-lock.json
116+
body: |
117+
Update to Sistent ${{ github.event.release.tag_name }}
118+
119+
_This pull request has been auto-generated by [l5io](http://github.com/l5io)_
120+
assignees: l5io
121+
draft: false

‎src/icons/Workspace/WorkspaceIcon.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import { DEFAULT_HEIGHT, DEFAULT_WIDTH, KEPPEL_GREEN_FILL } from '../../constants/constants';
2-
import { IconProps } from '../types';
2+
import { CustomIconProps } from '../types';
33

44
export const WorkspaceIcon = ({
55
width = DEFAULT_WIDTH,
66
height = DEFAULT_HEIGHT,
7+
secondaryFill = KEPPEL_GREEN_FILL,
8+
opacity = 0.8,
79
...props
8-
}: IconProps): JSX.Element => {
10+
}: CustomIconProps): JSX.Element => {
911
return (
1012
<svg
1113
xmlns="http://www.w3.org/2000/svg"
@@ -19,8 +21,9 @@ export const WorkspaceIcon = ({
1921
fill={props.fill}
2022
/>
2123
<path
24+
opacity={opacity}
2225
d="M2.25 1.625C1.65326 1.625 1.08097 1.86205 0.65901 2.28401C0.237053 2.70597 0 3.27826 0 3.875L0 14.5625C0 15.0101 0.17779 15.4393 0.494257 15.7557C0.810725 16.0722 1.23995 16.25 1.6875 16.25H2.42213C2.65735 15.4233 3.0662 14.6562 3.62138 14H1.125V3.875C1.125 3.57663 1.24353 3.29048 1.4545 3.0795C1.66548 2.86853 1.95163 2.75 2.25 2.75H15.75C16.0484 2.75 16.3345 2.86853 16.5455 3.0795C16.7565 3.29048 16.875 3.57663 16.875 3.875V14H14.3786C15.0019 14.7358 15.3799 15.5446 15.5779 16.25H16.3125C16.7601 16.25 17.1893 16.0722 17.5057 15.7557C17.8222 15.4393 18 15.0101 18 14.5625V3.875C18 3.27826 17.7629 2.70597 17.341 2.28401C16.919 1.86205 16.3467 1.625 15.75 1.625H2.25Z"
23-
fill={KEPPEL_GREEN_FILL || props.fill}
26+
fill={secondaryFill || KEPPEL_GREEN_FILL || props.fill}
2427
/>
2528
</svg>
2629
);

0 commit comments

Comments
 (0)