Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix generate assets #1107

Merged
merged 3 commits into from
Dec 27, 2021
Merged

fix generate assets #1107

merged 3 commits into from
Dec 27, 2021

Conversation

baurine
Copy link
Collaborator

@baurine baurine commented Dec 24, 2021

What did:

  • Fix scripts/generate_assets.go crash when building by DASHBOARD=COMPILE make pd-server in pd repo

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 24, 2021 •
edited

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • breeswish

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

baurine
baurine commented Dec 24, 2021
View reviewed changes
scripts/embed_ui_assets.sh Outdated
@@ -32,7 +32,7 @@ fi
echo "+ Embed UI assets"

cd "$PROJECT_DIR/scripts"
go run generate_assets.go "$PROJECT_DIR/ui/build" $BUILD_TAG_PARAMETER
go run generate_assets.go "$PROJECT_DIR/ui/build" $BUILD_TAG_PARAMETER
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$BUILD_TAG_PARAMETER may be empty

baurine
baurine commented Dec 24, 2021
View reviewed changes
scripts/generate_assets.go Outdated
Comment on lines 19 to 22
buildTag := ""
if len(os.Args) > 2 {
buildTag = os.Args[2]
}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When $BUILD_TAG_PARAMETER is empty, len(os.Args) == 2, and os.Args[2] would crash.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the problem is that the empty arguments cannot be passed to this program, could you try to resolve it? IMHO passing empty argument is a valid scenario. Maybe you can try with "$BUILD_TAG_PARAMETER" instead of $BUILD_TAG_PARAMETER?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, that's would be better, let me try it.

baurine
baurine commented Dec 27, 2021
View reviewed changes
scripts/generate_assets.go
@@ -12,7 +12,7 @@ import (
)

func main() {
if len(os.Args) < 2 {
if len(os.Args) < 3 {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

os.Args[0] is the command bin self.

@breezewish breezewish merged commit effee16 into pingcap:master Dec 27, 2021
@baurine baurine deleted the fix-generate-assets branch December 27, 2021 14:06
baurine added a commit to baurine/tidb-dashboard that referenced this pull request Dec 30, 2021
@baurine
script: fix generate assets (pingcap#1107)
daeb3a2
baurine added a commit that referenced this pull request Dec 30, 2021
@baurine @dependabot
@breezewish @shhdgit @YiniXu9506 @crazycs520
Release v2021.12.30.1 [skip pd_pr] (#1113)
b2c4a04 
* Revert "Release v2021.12.06.1 (#1084)"

This reverts commit bcc43a0.

* Compitable with different TiDB versions for conprof and non-root-login features (#1047)

* make conprof independent

* check feature enable

* add check feature enable middleware

* hide menu if feature is not enabled

* refactor non root login switch by new design

* i18n

* yarn fmt

* renaming

* adjust fe code

* refine

* remove unused log

* build(deps): bump ws from 5.2.2 to 5.2.3 in /ui (#1055)

* CICD: Update the release pipeline for recent PD format policies (#1054)

* fix i18n wording (#1056)

* Refactor: Change util module to util package (#1052)

* Refactor: Fix godot incorrectly add dot suffix to annotations (#1059)

* lint: Add goheader for copyright lints (#1062)

* Refactor: Migrate to use the `rest` package in util/ (#1060)

* fix(*): globally delete/update data by GORM (#1065)

* ui: bump dependencies (#1066)

* refactor: Switch to use ziputil, netutil, reflectutil and fileswap (#1067)

* Fix request header being pinned after pd profiling (#1069)

* Integrate speedscope (#1064)

* fix potential panic when GetPDInstances (#1075)

Signed-off-by: crazycs <chen.two.cs@gmail.com>

* Refactor: a new httpclient (#1073)

* Refactor: Switch to use util/distro in all places (#1078)

* chore: support import relative file URL (#1082)

* Refactor: Move tools into a standalone module (#1079)

* Fix script to embed the ui (#1088)

* Fix script to embed the ui

* Hack write_strings

* Refactor feature flag to support more modules (#1057)

* Drop sysutil dependency (#1093)

* chore: add graph generation (#1085)

* Refactor: Add TopologyProvider (#1098)

* esbuild: i18n + dep (#1101)

* script: Add a script to generate version matrix (#1104)

* distro: support dynamic config (#1094)

* chore: support multiple profiling types (#1095)

* fix(distro): check distro_strings.json fmt by prettier (#1106)

* script: fix generate assets (#1107)

* Add integration test (#1083)

* debug_api: Switch to use the new util (#1103)

* refactor(ui): auto refresh button (#1105)

* refactor(ui): auto refresh button

* chore: update translation

* fix: remain seconds

* refine: refresh button

* fix: onRefresh

* fix: auto refresh

* fix: continue tick

* chore: add some comments

* tweak: remaining refresh seconds

* chore: clean code

Co-authored-by: Wenxuan <breezewish@pingcap.com>

* ui: refine conprof (#1102)

* update wording

* not check prom any more

* replace time range component

* i18n

* support view profile by diffrent ways

* extract ActionsButton

* change download data format

* refine

* comments

* Revert "comments"

This reverts commit 3b03fdb.

* fix view cpu profile fail

* update state

* hide action button if disable

* address feedback

* update release-version

* sync with master

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Wenxuan <breezewish@pingcap.com>
Co-authored-by: Suhaha <jklopsdfw@gmail.com>
Co-authored-by: Yini Xu <34967660+YiniXu9506@users.noreply.github.com>
Co-authored-by: crazycs <crazycs520@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@breezewish breezewish breezewish approved these changes

Assignees
No one assigned
Labels
status/LGT1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@baurine @ti-chi-bot @breezewish