Skip to content

Commit

Permalink
Merge pull request #106 from VisActor/feat/vstory-next
Browse files Browse the repository at this point in the history
Feat/vstory next
  • Loading branch information
neuqzxy authored Nov 25, 2024
2 parents ed14cde + 7eaaa64 commit e0834d6
Show file tree
Hide file tree
Showing 793 changed files with 49,613 additions and 71,878 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bug-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: node common/scripts/install-run-rush.js update --bypass-policy

- name: Install rush
run: node common/scripts/install-run-rush.js install --bypass-policy
run: node common/scripts/install-run-rush.js update --bypass-policy

- name: Build
run: node common/scripts/install-run-rush.js build -t @internal/bugserver-trigger
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

# Install rush
- name: Install rush
run: node common/scripts/install-run-rush.js install --bypass-policy
run: node common/scripts/install-run-rush.js update --bypass-policy

- name: Parse semver version from branch name
id: semver_parser
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

# Install rush
- name: Install rush
run: node common/scripts/install-run-rush.js install --bypass-policy
run: node common/scripts/install-run-rush.js update --bypass-policy

- name: Create branch
run: |
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}
title: '[Auto changelog] changlog of ${{ github.event.release.tag_name }}'
base: develop
base: feat/vstory-next
head: 'docs/generate-changelog-${{ github.event.release.tag_name }}'
labels: changelog
body: 'update changelog of ${{ github.event.release.tag_name }}'
22 changes: 21 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
env
# Install rush
- name: Install rush
run: node common/scripts/install-run-rush.js install --bypass-policy
run: node common/scripts/install-run-rush.js update --bypass-policy

- name: Parse semver version from branch name
id: semver_parser
Expand All @@ -54,6 +54,26 @@ jobs:
- name: Update version
run: node common/scripts/install-run-rush.js version --bump

- name: Build vstory-core
run: node common/scripts/install-run-rush.js build --only @visactor/vstory-core

- name: Build vstory-templates
run: node common/scripts/install-run-rush.js build --only @visactor/vstory-templates

- name: Build vstory-editor
run: node common/scripts/install-run-rush.js build --only @visactor/vstory-editor

- name: Build vstory-animate
run: node common/scripts/install-run-rush.js build --only @visactor/vstory-animate

- name: Build vstory-player
run: node common/scripts/install-run-rush.js build --only @visactor/vstory-player

- name: Build vstory
env:
NODE_OPTIONS: "--max_old_space_size=4096"
run: node --max-old-space-size=8192000 --max_semi_space_size=8192000 common/scripts/install-run-rush.js build --only @visactor/vstory

- name: Build bugserver
run: node common/scripts/install-run-rush.js build --only @internal/bugserver-trigger

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sync-main-to-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

# Install rush
- name: Install rush
run: node common/scripts/install-run-rush.js install --bypass-policy
run: node common/scripts/install-run-rush.js update --bypass-policy

- name: Get version
id: package-version
Expand All @@ -55,7 +55,7 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}
title: '[Auto Sync] Sync the code from branch main to branch develop after release ${{ steps.package-version.outputs.current_version }}'
base: develop
base: feat/vstory-next
head: sync/main-${{ steps.package-version.outputs.current_version }}
reviewers: xile611
body: 'Sync the code from branch main to branch develop after release ${{ steps.package-version.outputs.current_version }}'
2 changes: 1 addition & 1 deletion .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Update rush
run: node common/scripts/install-run-rush.js update --bypass-policy
- name: Install rush
run: node common/scripts/install-run-rush.js install --bypass-policy
run: node common/scripts/install-run-rush.js update --bypass-policy
- run: node common/scripts/install-run-rush.js build --only tag:package
- name: Pre unit test
run: cd packages/vstory && node ../../common/scripts/install-run-rushx.js test && cd ../..
Expand Down

This file was deleted.

20 changes: 10 additions & 10 deletions common/config/rush/pnpm-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
/**
* Environment variables that will be provided to PNPM.
*/
// "environmentVariables": {
// "NODE_OPTIONS": {
// "value": "--max-old-space-size=4096",
// "override": false
// }
// },
"environmentVariables": {
"NODE_OPTIONS": {
"value": "--max-old-space-size=8192000 --max_semi_space_size=8192000",
"override": false
}
},

/**
* Specifies the location of the PNPM store. There are two possible values:
Expand Down Expand Up @@ -89,10 +89,10 @@
* PNPM documentation: https://pnpm.io/package_json#pnpmoverrides
*/
"globalOverrides": {
"@visactor/vrender": "0.20.11-alpha.3",
"@visactor/vrender-core": "0.20.11-alpha.3",
"@visactor/vrender-kits": "0.20.11-alpha.3",
"@visactor/vrender-components": "0.20.11-alpha.3",
"@visactor/vrender": "0.21.0-vstory.2",
"@visactor/vrender-core": "0.21.0-vstory.2",
"@visactor/vrender-kits": "0.21.0-vstory.2",
"@visactor/vrender-components": "0.21.0-vstory.2",
"@visactor/vscale": "0.18.5"
// "example2": "npm:@company/example2@^1.0.0"
},
Expand Down
Loading

0 comments on commit e0834d6

Please sign in to comment.