Skip to content

Commit

Permalink
Merge pull request #37 from VisActor/release/0.3.0
Browse files Browse the repository at this point in the history
[Auto release] release 0.3.0
  • Loading branch information
xile611 authored Jun 28, 2023
2 parents d59dcb6 + 599f0b0 commit beff456
Show file tree
Hide file tree
Showing 75 changed files with 950 additions and 356 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/bug-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ name: Bug Server CI

# 这里业务方根据需求设置
on:
pull_request:
push:
branches: ['main']
pull_request:
branches: ['main', 'develop']

jobs:
build:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ name: Pre-release CI
on:
push:
branches:
- pre-release/*
- 'pre-release/[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+'
- 'pre-release/[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+'
- 'pre-release/[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+'

jobs:
build:
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release CI
on:
push:
branches:
- release/*
- 'release/[0-9]+.[0-9]+.[0-9]+'

jobs:
build:
Expand Down Expand Up @@ -40,6 +40,12 @@ jobs:
- name: Build packages
run: node common/scripts/install-run-rush.js build --only tag:package

- name: Run bug server
working-directory: ./packages/vgrammar
env:
BUG_SERVER_TOKEN: ${{ secrets.BUG_SERVER_TOKEN }}
run: node ../../common/scripts/install-run-rushx.js ci

- name: Publish to npm
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Unit test CI

on:
pull_request:
branches: ['main']
branches: ['main', 'develop']

jobs:
build:
Expand Down
76 changes: 6 additions & 70 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ VGrammar, not only generate charts, but also provide data visualization tools.
<a href="">Cross-Platform</a>
</p>

![image test](https://github.com/visactor/vchart/actions/workflows/bug-server.yml/badge.svg)
![unit test](https://github.com/visactor/vchart/actions/workflows/unit-test.yml/badge.svg)
[![npm Version](https://img.shields.io/npm/v/@visactor/vgrammar.svg)](https://www.npmjs.com/package/@visactor/vgrammar)
[![npm Download](https://img.shields.io/npm/dm/@visactor/vgrammar.svg)](https://www.npmjs.com/package/@visactor/vgrammar)
[![license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/visactor/vgrammar/blob/main/LICENSE)
Expand Down Expand Up @@ -73,95 +75,29 @@ import { View } from '@visactor/vgrammar';

const spec = {
padding: { top: 5, right: 5, bottom: 30, left: 60 },

data: [
{
id: 'table',
values: [
{
name: 'Apple',
name: 'A',
value: 214480
},
{
name: 'Google',
name: 'B',
value: 155506
},
{
name: 'Amazon',
name: 'C',
value: 100764
},
{
name: 'Microsoft',
name: 'D',
value: 92715
},
{
name: 'Coca-Cola',
value: 66341
},
{
name: 'Samsung',
value: 59890
},
{
name: 'Toyota',
value: 53404
},
{
name: 'Mercedes-Benz',
value: 48601
},
{
name: 'Facebook',
value: 45168
},
{
name: "McDonald's",
value: 43417
},
{
name: 'Intel',
value: 43293
},
{
name: 'IBM',
value: 42972
},
{
name: 'BMW',
value: 41006
},
{
name: 'Disney',
value: 39874
},
{
name: 'Cisco',
value: 34575
},
{
name: 'GE',
value: 32757
},
{
name: 'Nike',
value: 30120
},
{
name: 'Louis Vuitton',
value: 28152
},
{
name: 'Oracle',
value: 26133
},
{
name: 'Honda',
value: 23682
}
]
}
],

scales: [
{
id: 'xscale',
Expand Down
21 changes: 13 additions & 8 deletions common/autoinstallers/lint/change-all.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { spawnSync, execSync } from 'child_process';
interface RunScriptArgv extends ParsedArgs {
message?: string;
type?: string;
'not-commit'?: boolean;
}

function run() {
Expand All @@ -14,6 +15,7 @@ function run() {
const argv: RunScriptArgv = minimist(process.argv.slice(2));
let message = argv.message;
let bumpType = argv.type;
let notCommit = argv['not-commit']

if (!message) {
const lastCommitMessage = execSync('git log -1 --pretty=%B ').toString();
Expand Down Expand Up @@ -48,15 +50,18 @@ function run() {
shell: false,
});

spawnSync('sh', ['-c', 'git add --all'], {
stdio: 'inherit',
shell: false,
});
if (!notCommit) {
spawnSync('sh', ['-c', 'git add --all'], {
stdio: 'inherit',
shell: false,
});

spawnSync('sh', ['-c', `git commit -m 'docs: update changlog of rush'`], {
stdio: 'inherit',
shell: false,
});
}

spawnSync('sh', ['-c', `git commit -m 'docs: update changlog of rush'`], {
stdio: 'inherit',
shell: false,
});
}

run();
8 changes: 8 additions & 0 deletions common/config/rush/command-line.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,14 @@
"argumentName": "MESSAGE",
"required": false
},
{
"parameterKind": "flag",
"longName": "--not-commit",
"shortName": "-n",
"description": "not commit after run rush change",
"associatedCommands": ["change-all"],
"required": false
},
{
"parameterKind": "choice",
"longName": "--type",
Expand Down
Loading

0 comments on commit beff456

Please sign in to comment.