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

feat: release v10.2.0 as latest #156

Merged
merged 7 commits into from
Jan 16, 2024
Merged

feat: release v10.2.0 as latest #156

merged 7 commits into from
Jan 16, 2024

Conversation

jan-xyz
Copy link
Contributor

@jan-xyz jan-xyz commented Jan 4, 2024

fixes: #150

I had to uncomment withStyle as this doesn't exist anymore for v10.2.0 dashboards. This probably breaks backwards compatibility with previous versions. Do you have a better idea on how to handle that? I also had to switch the script from jrsonnet to jsonnet since that tool had problems with the any property in the custom boards. I am not sure if I was using simply the wrong tool or if there is something else going on. I can simply revert that specific commit if it is a problem on my side.

I suggest to look commit-by-commit.

tools used:

❯ jrsonnet --version
jrsonnet 0.4.2
❯ jsonnet --version
Jsonnet commandline interpreter (Go implementation) v0.20.0
❯ bash --version
GNU bash, version 5.2.21(1)-release (aarch64-apple-darwin23.0.0)
Copyright (C) 2022 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>

This is free software; you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.

@jan-xyz jan-xyz requested a review from a team January 4, 2024 18:22
@CLAassistant
Copy link

CLAassistant commented Jan 4, 2024

CLA assistant check
All committers have signed the CLA.

scripts/generate.sh Outdated Show resolved Hide resolved
Copy link
Member

@Duologic Duologic left a comment

Choose a reason for hiding this comment

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

Can you also regenerate the other versions? This should only remove the withStyle function.

@jan-xyz
Copy link
Contributor Author

jan-xyz commented Jan 5, 2024

Can you also regenerate the other versions? This should only remove the withStyle function.

Hmmm, it seems like it also changes the type annotations from type: foo to type: [foo]

-  '#withName': { 'function': { args: [{ default: null, enums: null, name: 'value', type: 'string' }], help: '' } },
+  '#withName': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: '' } },

@Duologic
Copy link
Member

Duologic commented Jan 5, 2024

Type was changed in #154, can you rebase?

@jan-xyz jan-xyz force-pushed the v10.2.0 branch 2 times, most recently from a11cb04 to 58ec2d8 Compare January 6, 2024 09:31
@jan-xyz
Copy link
Contributor Author

jan-xyz commented Jan 6, 2024

regenerating is done, and as you said no changes but the removal of withStyle

@Duologic
Copy link
Member

Ugh, sorry, #159 got merged and is causing a conflict. Can you rebase?

Comment on lines +76 to +78
local normalized = panelUtil.normalizeY(uncollapsed);

std.map(function(p) p + { gridPos+: { y+: startY } }, normalized),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The rebase change

@Duologic Duologic merged commit f78203c into grafana:main Jan 16, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add v10.2.0
3 participants