这是indexloc提供的服务，不要输入任何密码
Skip to content

[blockly] Fix timer remove regression #2032

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
Merged
merged 1 commit into from
Aug 29, 2023
Merged

[blockly] Fix timer remove regression #2032

merged 1 commit into from
Aug 29, 2023

Conversation

@stefan-hoehn
Copy link
Contributor

@stefan-hoehn stefan-hoehn commented Aug 21, 2023 •
edited by florian-h05
Loading

Fixes #2002.

@stefan-hoehn
fix timer remove regression
95bf0eb 
Signed-off-by: Stefan Höhn <mail@stefanhoehn.com>
@stefan-hoehn stefan-hoehn requested a review from a team as a code owner August 21, 2023 07:29
@relativeci
Copy link

relativeci bot commented Aug 21, 2023

Job #1116: Bundle Size — 15.75MiB (~-0.01%).

416fcf0(current) vs 26fca17 main#1115(baseline)

⚠️ Bundle contains 16 duplicate packages

Metrics (1 change)
                 Current
Job #1116		      Baseline
Job #1115
Initial JS 1.67MiB(-0.01%) 1.67MiB
Initial CSS 608.89KiB 608.89KiB
Cache Invalidation 93.94% 93.94%
Chunks 219 219
Assets 689 689
Modules 1700 1700
Duplicate Modules 90 90
Duplicate Code 1.95% 1.95%
Packages 138 138
Duplicate Packages 15 15
Total size by type (2 changes)
                 Current
Job #1116		      Baseline
Job #1115
CSS 859.34KiB 859.34KiB
Fonts 526.1KiB 526.1KiB
HTML 1.23KiB 1.23KiB
IMG 140.74KiB 140.74KiB
JS 9.25MiB (~-0.01%) 9.25MiB
Media 295.6KiB 295.6KiB
Other 4.72MiB (~-0.01%) 4.72MiB

View job #1116 report View main branch activity

florian-h05
florian-h05 approved these changes Aug 29, 2023
View reviewed changes
Copy link
Contributor

@florian-h05 florian-h05 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!
I’ve just had a look a the Nashorn code, there it also does not remove the timer from this.

@florian-h05 florian-h05 changed the title [blockly] fix timer remove regression [blockly] Fix timer remove regression Aug 29, 2023
@florian-h05 florian-h05 added bug Something isn't working main ui Main UI labels Aug 29, 2023
@florian-h05 florian-h05 added this to the 4.1 milestone Aug 29, 2023
@florian-h05 florian-h05 merged commit 9e9caba into openhab:main Aug 29, 2023
@florian-h05 florian-h05 deleted the blocky_fix_timer branch August 30, 2023 10:58
@florian-h05
Copy link
Contributor

florian-h05 commented Sep 9, 2023

@kaikreuzer Can you please cherry pick this to 4.0.x before the release is done? I’ve mentioned it in the release thread, seems like you didn’t see it.

kaikreuzer pushed a commit that referenced this pull request Sep 9, 2023
@stefan-hoehn @kaikreuzer
[blockly] Fix timer remove regression (#2032)
a1583af 
Fixes #2002.

Signed-off-by: Stefan Höhn <mail@stefanhoehn.com>
@kaikreuzer
Copy link
Member

kaikreuzer commented Sep 9, 2023

I indeed didn't see the message and so this unfortunately hasn't yet been backported before the 4.0.3 build. I did so now, so that it will end up in 4.0.4.
Please best always consider backporting directly when merging a PR; otherwise it also becomes very tricky with the compilation of the release notes.

@kaikreuzer kaikreuzer added the backported A PR that has been cherry-picked to a patch release branch label Sep 9, 2023
@florian-h05
Copy link
Contributor

florian-h05 commented Sep 11, 2023

I usually backport when merging, but I was away (on vacation) and only had my phone with me, I merged with GitHub web but I cannot backport from my phone. Thanks for doing it anyway.

@florian-h05 florian-h05 mentioned this pull request Sep 17, 2023
Closed
stefan-hoehn added a commit to stefan-hoehn/openhab-webui that referenced this pull request Sep 23, 2023
@stefan-hoehn
[blockly] Fix timer remove regression (openhab#2032)
018feee 
Fixes openhab#2002.

Signed-off-by: Stefan Höhn <mail@stefanhoehn.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@florian-h05 florian-h05 florian-h05 approved these changes

Assignees

No one assigned

Labels

backported A PR that has been cherry-picked to a patch release branch bug Something isn't working main ui Main UI

Projects

None yet

Milestone

4.1

Development

Successfully merging this pull request may close these issues.

[blockly] bug in "after" block (count script)

3 participants

@stefan-hoehn @florian-h05 @kaikreuzer