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.

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

Fix ModifyTime function in arm64 #3010

Merged
merged 2 commits into from
Mar 11, 2022
Merged

Conversation

cwen0
Copy link
Member

@cwen0 cwen0 commented Mar 11, 2022

Signed-off-by: Cwen Yin cwenyin0@gmail.com

What problem does this PR solve?

Fix build chaos mesh in arm64: https://github.com/chaos-mesh/chaos-mesh/runs/5500395233?check_suite_focus=true

pkg/chaosdaemon/time_server.go:46:24: too many arguments in call to "github.com/chaos-mesh/chaos-mesh/pkg/time".ModifyTime
	have (int, int64, int64, uint64, logr.Logger)
	want (int, int64, int64, uint64)
pkg/chaosdaemon/time_server.go:75:24: too many arguments in call to "github.com/chaos-mesh/chaos-mesh/pkg/time".ModifyTime
	have (int, int64, int64, number, logr.Logger)
	want (int, int64, int64, uint64)
make: *** [Makefile:165: images/chaos-daemon/bin/chaos-daemon] Error 2

What's changed and how it works?

Related changes

  • Need to update chaos-mesh/website
  • Need to update Dashboard UI
  • Need to cheery-pick to release branches
    • release-2.1
    • release-2.0

Checklist

Tests

  • Unit test
  • E2E test
  • No code
  • Manual test (add steps below)

Side effects

  • Breaking backward compatibility

Release note

Please add a release note.

You can safely ignore this section if you don't think this PR needs a release note.

DCO

If you find the DCO check fails, please run commands like below (Depends on the actual situations. For example, if the failed commit isn't the most recent) to fix it:

git commit --amend --signoff
git push --force

Signed-off-by: Cwen Yin <cwenyin0@gmail.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 11, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • WangXiangUSTC
  • YangKeao

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.

@cwen0 cwen0 added the type/bug-fix A bug needs to be fixed. label Mar 11, 2022
Signed-off-by: Cwen Yin <cwenyin0@gmail.com>
@codecov
Copy link

codecov bot commented Mar 11, 2022

Codecov Report

Merging #3010 (334e101) into master (2f18784) will decrease coverage by 0.16%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3010      +/-   ##
==========================================
- Coverage   38.17%   38.01%   -0.17%     
==========================================
  Files         105      105              
  Lines        9094     9094              
==========================================
- Hits         3472     3457      -15     
- Misses       5315     5331      +16     
+ Partials      307      306       -1     
Impacted Files Coverage Δ
.../workflow/controllers/workflow_entry_reconciler.go 46.03% <0.00%> (-6.88%) ⬇️
pkg/workflow/controllers/deadline_reconciler.go 66.66% <0.00%> (-2.97%) ⬇️
pkg/selector/generic/mode.go 28.20% <0.00%> (+2.56%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2f18784...334e101. Read the comment docs.

Copy link
Member

@YangKeao YangKeao left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@WangXiangUSTC WangXiangUSTC left a comment

Choose a reason for hiding this comment

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

LGTM

@WangXiangUSTC
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 334e101

@ti-chi-bot ti-chi-bot merged commit 6e83256 into chaos-mesh:master Mar 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants