Skip to content

Commit

Permalink
Merge branch 'master' into PR-5518
Browse files Browse the repository at this point in the history
  • Loading branch information
gagan-bhullar-tech authored Aug 31, 2024
2 parents cd1c123 + 688164f commit 0c2c4b1
Show file tree
Hide file tree
Showing 1,143 changed files with 9,833 additions and 1,033 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Checks
on:
pull_request:
branches: [ master ]
types: [opened, synchronize, reopened]


jobs:
checks:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: actions/checkout@master
with:
persist-credentials: false
fetch-depth: 1

- name: NPM Install
run: npm install

- name: Build
run: npm run build

- name: Run Eslint
run: npm run checklint
8 changes: 4 additions & 4 deletions .github/workflows/meshmap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ jobs:
run: |
export pull_number=$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")
echo "PULL_NO=$pull_number" >> $GITHUB_ENV
- uses: actions/checkout@v3
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/checkout@v4
with:
path: action
repository: layer5labs/meshmap-snapshot
- id: test_result
uses: ${GITHUB_REF/refs/tags//}
with:
githubToken: ${{ secrets.GITHUB_TOKEN }}
providerToken: ${{ secrets.PROVIDER_TOKEN }}
mesheryToken: ${{ secrets.MESHERY_TOKEN }}
prNumber: ${{ env.PULL_NO }}
application_type: Kubernetes Manifest
filePath: ${{ inputs.fileName == '' && 'lkjh' || inputs.fileName }}
filePath: ${{ inputs.fileName == '' && '.gitpod.yml' || inputs.fileName }}
14 changes: 13 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ We are beyond excited to see that you want to contribute! We would love to accep

⚠️ Cloning this repository ⚠️

Cloning the repo with all its history results in a ~6 GB download. If you don't need the whole history you can use the depth parameter to significantly reduce download size.
Cloning the repo with all its history results in a ~6 GB download. To contribute to this site, you don't need its entire history. Use the `--depth=1` flag to significantly reduce the footprint this repo creates in your environment.

```bash
git clone --depth=1 https://github.com/layer5io/layer5.git
Expand Down Expand Up @@ -558,6 +558,18 @@ git push -u origin <your_branch_name>

**15.** Once you’ve committed and pushed all of your changes to GitHub, go to the page for your fork on GitHub, select your development branch, and click the pull request button. Please ensure that you compare your feature branch to the desired branch of the repo you are supposed to make a PR to. If you need to make any adjustments to your pull request, just push the updates to GitHub. Your pull request will automatically track the changes in your development branch and update it.

### Lint Rules

Layer5 uses ESLint to maintain code quality and consistency in our UI code. Use this command to trigger a lint check:

```sh
make lint
```

> Note:
> - Eslint in Gatsby requires generating config files from CLI. Run `gatsby build` or `gatsby develop` if you face this error during linting.

## Signing-off on Commits

To contribute to this project, you must agree to the **Developer Certificate of
Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,8 @@ build:
clean:
gatsby clean && make site

.PHONY: setup build site clean site-fast
## Run Eslint on your local machine.
lint:
npm run lint

.PHONY: setup build site clean site-fast lint
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ In the Istio management page:

3. Click the `Deploy` button on the confirmation modal.

{" "}
<a href={IstioDeploy}>
<img src={IstioDeploy} width="70%" align="center" />
</a>
Expand Down
6 changes: 6 additions & 0 deletions gatsby-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,12 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
redirectInBrowser: true,
isPermanent: true,
});
createRedirect({
fromPath: "/blog/announcements/meshery-5000-star-milestone",
toPath: "/blog/announcements/mesherys-5000-star-milestone",
redirectInBrowser: true,
isPermanent: true,
});

//****
// External Resource Redirects
Expand Down
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@sideway/address": "^5.0.0",
"@svgr/webpack": "^8.0.1",
"@types/mui-datatables": "^4.3.12",
"axios": "^1.6.7",
"axios": "^1.7.3",
"babel-plugin-styled-components": "^2.1.4",
"babel-preset-gatsby": "^2.22.0",
"cytoscape": "^3.28.1",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
77 changes: 77 additions & 0 deletions src/assets/images/code-cleanup-crew/code-cleanup-crew.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 0c2c4b1

Please sign in to comment.