Skip to content

Commit

Permalink
Merge branch 'layer5io:master' into mobile-nav#5713
Browse files Browse the repository at this point in the history
  • Loading branch information
upsaurav12 authored Aug 4, 2024
2 parents 02acd04 + 92d3e68 commit 118c890
Show file tree
Hide file tree
Showing 127 changed files with 2,728 additions and 957 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/build-and-preview-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ jobs:
npm install
npm run noIndex
- name: Run Eslint
run: npm run checklint

- name: Zip Site
run: bash ./script.sh

Expand Down
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 }}
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx lint-staged
npm run checklint
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
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
Loading

0 comments on commit 118c890

Please sign in to comment.