Skip to content

Commit

Permalink
Merge branch 'master' into RipulHandoo/mesheryctl/PushAndPull
Browse files Browse the repository at this point in the history
Signed-off-by: Ripul Handoo <ripulhandoo1234@gmail.com>
  • Loading branch information
RipulHandoo committed Mar 29, 2024
2 parents 66b76f3 + 380160d commit 21e160f
Show file tree
Hide file tree
Showing 3,720 changed files with 89,575 additions and 17,971 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/models.md
Expand Up @@ -15,8 +15,8 @@ assignees: ''

### Contributor [Guides](https://docs.meshery.io/project/contributing) and [Handbook](https://layer5.io/community/handbook)

- [MeshModel Repository](https://github.com/meshery/meshery/tree/master/server/meshmodel)
- 🖥 [MeshModel Overview](https://docs.google.com/presentation/d/1SQMfyu5shjpGKlYONdVzOtd7UYTgLWBcgUvHMLCZ2tY/edit#slide=id.g226f5de5180_19_259)
- [Models Repository](https://github.com/meshery/meshery/tree/master/server/meshmodel)
- 🖥 [Models Overview](https://docs.google.com/presentation/d/1SQMfyu5shjpGKlYONdVzOtd7UYTgLWBcgUvHMLCZ2tY/edit#slide=id.g226f5de5180_19_259)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](http://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)

## Contributing to Meshery Models
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-preview-site.yml
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Zip Site
run: bash docs/script.sh
- name: Upload files
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: site-dir
path: ./site-dir.zip
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-and-release-edge.yml
Expand Up @@ -14,9 +14,9 @@ jobs:
if: github.repository == 'meshery/meshery'
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Check if handlers were modified
uses: dorny/paths-filter@v2
uses: dorny/paths-filter@v3
id: changes
with:
filters: |
Expand All @@ -36,7 +36,7 @@ jobs:
run: |
make swagger-docs-build
- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
file_pattern: docs
commit_user_name: l5io
Expand All @@ -51,11 +51,11 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Check if schema was modified
uses: dorny/paths-filter@v2
uses: dorny/paths-filter@v3
id: filter
with:
filters: |
Expand All @@ -73,7 +73,7 @@ jobs:
cd docs; bundle install; cd ..; \
make graphql-docs-build
- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
file_pattern: docs
commit_user_name: l5io
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-and-release-stable.yml
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Check if handlers were modified
uses: dorny/paths-filter@v2
uses: dorny/paths-filter@v3
id: changes
with:
filters: |
Expand All @@ -33,7 +33,7 @@ jobs:
run: |
make swagger-docs-build
- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
file_pattern: docs
commit_user_name: l5io
Expand All @@ -52,7 +52,7 @@ jobs:
with:
fetch-depth: 1
- name: Check if schema was modified
uses: dorny/paths-filter@v2
uses: dorny/paths-filter@v3
id: filter
with:
filters: |
Expand All @@ -70,7 +70,7 @@ jobs:
cd docs; bundle install; cd ..; \
make graphql-docs-build
- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
file_pattern: docs
commit_user_name: l5io
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/build-ui-and-server.yml
Expand Up @@ -103,16 +103,16 @@ jobs:
# runs-on: ubuntu-22.04
# steps:
# - name: Check out code
# uses: actions/checkout@v3
# uses: actions/checkout@v4
# with:
# fetch-depth: 0
# - name: Check out meshery-istio code
# uses: actions/checkout@v3
# uses: actions/checkout@v4
# with:
# repository: layer5io/meshery-istio
# path: ./meshery-istio
# - name: Check out meshery-consul code
# uses: actions/checkout@v3
# uses: actions/checkout@v4
# with:
# repository: layer5io/meshery-consul
# path: ./meshery-consul
Expand Down Expand Up @@ -188,12 +188,12 @@ jobs:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# - name: Upload artifacts
# if: always()
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: cypress-ss
# path: ./ui/cypress/screenshots
# - name: Upload Videos
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# if: always()
# with:
# name: cypress-ss
Expand Down Expand Up @@ -240,9 +240,9 @@ jobs:
name: swagger-docs
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Check if handlers were modified
uses: dorny/paths-filter@v2
uses: dorny/paths-filter@v3
id: changes
with:
filters: |
Expand All @@ -267,7 +267,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Check if schema was modified
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-ui-server-reusable-workflow.yml
Expand Up @@ -22,7 +22,7 @@ jobs:
with:
go-version: "1.21"
- name: Setup Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
Expand All @@ -31,7 +31,7 @@ jobs:
- run: |
GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go build -tags draft ./server/cmd/main.go ./server/cmd/error.go
- name: Upload artifacts
uses: actions/upload-artifact@v3.0.0
uses: actions/upload-artifact@v4
with:
name: meshery
path: ./main
Expand All @@ -44,12 +44,12 @@ jobs:
with:
repository: meshery/meshery
fetch-depth: 1
- uses: actions/setup-node@v3.0.0
- uses: actions/setup-node@v4
with:
node-version: 18
- name: Cache node modules
id: node-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/cache
Expand All @@ -75,12 +75,12 @@ jobs:
run: |
make ui-provider-build
- name: upload meshery-ui artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: meshery-ui-build
path: ui/out/
- name: upload Meshery-provider-ui artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: meshery-provider-ui build
path: provider-ui/out/
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Expand Up @@ -41,7 +41,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -52,7 +52,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -66,4 +66,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v3
4 changes: 2 additions & 2 deletions .github/workflows/discussions-data-files-update.yml
Expand Up @@ -11,15 +11,15 @@ jobs:
if: github.repository == 'meshery/meshery'
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.GH_ACCESS_TOKEN }}
- name: Fetch data for mesheryctl tag
run: curl https://discuss.layer5.io/tag/mesheryctl.json -o docs/_data/discuss/mesheryctl.json
- name: Fetch data for meshery tag
run: curl https://discuss.layer5.io/tag/meshery.json -o docs/_data/discuss/meshery.json
- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
file_pattern: docs/_data/discuss/*.json
commit_user_name: Discussions bot
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2etest.yaml
Expand Up @@ -21,9 +21,9 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Uploading file
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: patternfile
path: ./.github/samples/emojivoto.yaml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/error-codes-updater.yaml
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Commit changes
if: ${{ github.event_name != 'pull_request' }} # Skip for pull requests
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
file_pattern: mesheryctl/helpers server/helpers/ **.go docs/
commit_user_name: l5io
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/eslint-gh.yml
Expand Up @@ -5,7 +5,7 @@ jobs:
name: runner / eslint
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Run ESLint Meshery-UI
run: cd ui && npm i eslint && npx eslint .
- name: Run ESLint Provider-UI
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go-mod-sync.yaml
Expand Up @@ -31,7 +31,7 @@ jobs:
run: cd meshery-extensions;make graphql-sync;

- name: Commit
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
repository: meshery-extensions
commit_user_name: l5io
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/graphql.yml
Expand Up @@ -28,7 +28,7 @@ jobs:
bundle install
bundle exec rake graphql:compile_docs
- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
file_pattern: docs/
commit_user_name: l5io
Expand Down
39 changes: 24 additions & 15 deletions .github/workflows/integrations-updater.yml
@@ -1,19 +1,18 @@
name: Meshery Integrations Updater
on:
push:
branches:
- "master"
paths:
- ".github/workflows/integrations-updater.yml"
branches:
- "master"
paths:
- ".github/workflows/integrations-updater.yml"
schedule:
- cron: '0 0 * * *' # Run the job every day at midnight
- cron: "0 0 * * *" # Run the job every day at midnight
workflow_dispatch:

# This workflow uses the service account: meshery-integrations-sheet@meshery-237716.iam.gserviceaccount.com
# See these instructions for setup - https://theoephraim.github.io/node-google-spreadsheet/#/getting-started/authentication

jobs:

integrations:
if: github.repository == 'meshery/meshery'
runs-on: ubuntu-22.04
Expand All @@ -38,14 +37,25 @@ jobs:
repository: meshery/meshery.io
token: ${{ secrets.GH_ACCESS_TOKEN }}
path: meshery.io
- name: Run utility
env:
CRED: ${{ secrets.INTEGRATION_SPREADSHEET_CRED }}
- name: Build mesheryctl
working-directory: ./meshery/mesheryctl
run: |
make;
- name: Pubish to meshery.io site
working-directory: ./meshery/mesheryctl
run: |
./mesheryctl registry publish website ${{ secrets.INTEGRATION_SPREADSHEET_CRED }} 1DZHnzxYWOlJ69Oguz4LkRVTFM79kC2tuvdwizOJmeMw meshery.io/integrations meshery.io/assets/images/integration -o js
- name: Pubish to layer5.io site
working-directory: ./meshery/mesheryctl
run: |
cd meshery/scripts/component_updater
go run main.go 1DZHnzxYWOlJ69Oguz4LkRVTFM79kC2tuvdwizOJmeMw --system docs layer5/src/collections/integrations meshery.io/integrations docs/
./mesheryctl registry publish website ${{ secrets.INTEGRATION_SPREADSHEET_CRED }} 1DZHnzxYWOlJ69Oguz4LkRVTFM79kC2tuvdwizOJmeMw layer5/src/collections/integrations layer5/src/collections/integrations -o mdx
- name: Pubish to Meshery docs
working-directory: ./meshery/mesheryctl
run: |
./mesheryctl registry publish website ${{ secrets.INTEGRATION_SPREADSHEET_CRED }} 1DZHnzxYWOlJ69Oguz4LkRVTFM79kC2tuvdwizOJmeMw docs/pages/integrations docs/assets/img/integrations -o md
- name: Commit changes to Layer5.io repo
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_user_name: l5io
repository: ./layer5
Expand All @@ -55,7 +65,7 @@ jobs:
commit_message: "[Docs] Generated documentation for Integration"
branch: master
- name: Commit changes to Meshery.io repo
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_user_name: l5io
repository: ./meshery.io
Expand All @@ -65,7 +75,7 @@ jobs:
commit_message: "[Docs] Generated documentation for Integration"
branch: master
- name: Commit changes to Meshery repo
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_user_name: l5io
repository: ./meshery
Expand All @@ -74,4 +84,3 @@ jobs:
commit_options: "--signoff"
commit_message: "[Docs] Generated documentation for Integration"
branch: master

4 changes: 2 additions & 2 deletions .github/workflows/mesheryctl-ci.yml
Expand Up @@ -58,7 +58,7 @@ jobs:
restore-keys: |
${{ runner.os }}-go-
- name: goreleaser WITHOUT tag
uses: goreleaser/goreleaser-action@v4
uses: goreleaser/goreleaser-action@v5
if: success() && startsWith(github.ref, 'refs/tags/') == false
env:
RELEASE_CHANNEL: "edge"
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
cd mesheryctl
make docs
- name: Commit ✅
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
file_pattern: docs
commit_user_name: l5io
Expand Down

0 comments on commit 21e160f

Please sign in to comment.