Skip to content

Commit

Permalink
Merge branch 'layer5io:master' into 496-meshery-ui-app
Browse files Browse the repository at this point in the history
  • Loading branch information
nebula-aac authored Dec 4, 2024
2 parents b19e434 + 3f7a664 commit 16ab086
Show file tree
Hide file tree
Showing 111 changed files with 8,143 additions and 1,886 deletions.
56 changes: 38 additions & 18 deletions .github/workflows/bump-meshery-version.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,30 @@
name: Bump Meshery, Meshery Extensions and Meshery Cloud

on:
release:
types: [published]
workflow_run:
workflows: [Publish Node.js Package]
types:
- completed

jobs:
versions-check:
runs-on: ubuntu-latest
outputs:
current: ${{ steps.current.outputs.VERSION }}
steps:
- name: Download Version
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
name: version-number
github-token: ${{ secrets.GH_ACCESS_TOKEN }}
run-id: ${{ github.event.workflow_run.id }}
- name: Retrieve Version
run: |
echo "VERSION=$(cat ./number)" >> $GITHUB_OUTPUT
id: current
bump-meshery:
runs-on: ubuntu-latest
needs: versions-check
steps:
- name: Checkout Meshery code
uses: actions/checkout@v4
Expand All @@ -21,30 +39,31 @@ jobs:
cache-dependency-path: '**/package-lock.json'
- name: Make changes to pull request
working-directory: ui
run: npm install @layer5/sistent@latest
run: npm install @layer5/sistent@${{needs.versions-check.outputs.current}}
- name: Create Pull Request
id: cpr
uses: peter-evans/create-pull-request@v7
with:
token: ${{ secrets.RELEASEDRAFTER_PAT }}
commit-message: Bump sistent ${{ github.event.release.tag_name }} dependencies
commit-message: Bump sistent v${{ needs.versions-check.outputs.current }} dependencies
committer: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
author: "l5io"
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
signoff: true
branch: bump-sistent-bot
delete-branch: true
title: '[Chore]: Bump ${{ github.event.release.name }}'
title: '[Chore]: Bump Sistent v${{ needs.versions-check.outputs.current }}'
add-paths: |
ui/package.json
ui/package-lock.json
body: |
Update to Sistent ${{ github.event.release.tag_name }}
Update to Sistent v${{ needs.versions-check.outputs.current }}
_This pull request has been auto-generated by [l5io](http://github.com/l5io)_
assignees: l5io
draft: false
bump-meshery-extensions:
runs-on: ubuntu-latest
needs: versions-check
steps:
- name: Checkout Meshery Extensions code
uses: actions/checkout@v4
Expand All @@ -59,30 +78,31 @@ jobs:
cache-dependency-path: '**/package-lock.json'
- name: Make changes to pull request
working-directory: meshmap
run: npm install @layer5/sistent@latest
run: npm install @layer5/sistent@${{needs.versions-check.outputs.current}}
- name: Create Pull Request
id: cpr
uses: peter-evans/create-pull-request@v7
with:
token: ${{ secrets.RELEASEDRAFTER_PAT }}
commit-message: Bump sistent ${{ github.event.release.tag_name }} dependencies
commit-message: Bump sistent v${{ needs.versions-check.outputs.current }} dependencies
committer: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
author: "l5io"
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
signoff: true
branch: bump-sistent-bot
delete-branch: true
title: '[Chore]: Bump ${{ github.event.release.name }}'
title: '[Chore]: Bump Sistent v${{needs.versions-check.outputs.current }}'
add-paths: |
meshmap/package.json
meshmap/package-lock.json
body: |
Update to Sistent ${{ github.event.release.tag_name }}
Update to Sistent v${{ needs.versions-check.outputs.current }}
_This pull request has been auto-generated by [l5io](http://github.com/l5io)_
assignees: l5io
draft: false
bump-meshery-cloud:
runs-on: ubuntu-latest
needs: versions-check
steps:
- name: Checkout Meshery Extensions code
uses: actions/checkout@v4
Expand All @@ -97,25 +117,25 @@ jobs:
cache-dependency-path: '**/package-lock.json'
- name: Make changes to pull request
working-directory: ui
run: npm install @layer5/sistent@latest
run: npm install @layer5/sistent@${{needs.versions-check.outputs.current}}
- name: Create Pull Request
id: cpr
uses: peter-evans/create-pull-request@v7
with:
token: ${{ secrets.RELEASEDRAFTER_PAT }}
commit-message: Bump sistent ${{ github.event.release.tag_name }} dependencies
commit-message: Bump sistent v${{ needs.versions-check.outputs.current }} dependencies
committer: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
author: "l5io"
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
signoff: true
branch: bump-sistent-bot
delete-branch: true
title: '[Chore]: Bump ${{ github.event.release.name }}'
title: '[Chore]: Bump Sistent v${{ needs.versions-check.outputs.current }}'
add-paths: |
ui/package.json
ui/package-lock.json
body: |
Update to Sistent ${{ github.event.release.tag_name }}
Update to Sistent v${{ needs.versions-check.outputs.current }}
_This pull request has been auto-generated by [l5io](http://github.com/l5io)_
assignees: l5io
draft: false
draft: false
2 changes: 1 addition & 1 deletion .github/workflows/preview-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
uses: actions/[email protected]

- name: Download Site dir
uses: dawidd6/action-download-artifact@v2
uses: dawidd6/action-download-artifact@v6
with:
github_token: ${{ secrets.GH_ACCESS_TOKEN }}
workflow: build-and-preview-site.yml
Expand Down
25 changes: 25 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,28 @@ jobs:
npm publish --verbose
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
versions-check:
needs: publish-gpr
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v7
id: versions
with:
result-encoding: string
script: |
let str = `${{github.event.release.tag_name}}`
return str.replace(/^v/, '')
- name: Save Release number
if: ${{ !cancelled() }}
run: |
mkdir -p ./version
echo ${{ steps.versions.outputs.result }} > ./version/number
- name: Upload Version Report
if: ${{ !cancelled() }}
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
with:
name: version-number
path: |
version/number
retention-days: 14
40 changes: 0 additions & 40 deletions .github/workflows/storybook-deploy.yml

This file was deleted.

Loading

0 comments on commit 16ab086

Please sign in to comment.