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

Update website and doc repo links to use archived 3.4.x docs #2502

Merged
merged 2 commits into from
Mar 28, 2024

Conversation

florian-h05
Copy link
Contributor

@florian-h05 florian-h05 commented Mar 25, 2024

This is required to keep add-on logos working for 3.4.x, because with the introduction of SVG logo support and the conversion of some logos, 3.4.x would not be able to display SVG logos.
For the docs, it is also really helpful to link to the docs matching the version, because due to the number of breaking changes for openHAB 4.0 there are larger difference in parts of the docs. Linking the wrong could cause confusion.

@florian-h05 florian-h05 requested a review from a team as a code owner March 25, 2024 13:16
@florian-h05 florian-h05 force-pushed the 3.4.x-docs-link branch 2 times, most recently from 27e0b66 to 3a136a5 Compare March 25, 2024 13:21
@@ -143,8 +143,7 @@ export default {
},
imageUrl () {
if (this.addon.imageLink) return this.addon.imageLink.replace(/^\/\//, 'https://')
let docsBranch = 'final'
if (this.$store.state.runtimeInfo.buildString === 'Release Build') docsBranch = 'final-stable'
let docsBranch = 'final-3.4.x'
Copy link
Contributor

Choose a reason for hiding this comment

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

In general I don't like the idea of the hardcoded branch name here but in main this part is gone anyway.

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 hard-coded branch name is however needed here, as this whole PR is just there to make the already releases 3.4.x version access the archived docs. main is a. unaffected and b. has improved the whole website link and add-on logo code, so that if we ever need to fix the docs version again after a future release, we have to change less code.

Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
@florian-h05
Copy link
Contributor Author

@stefan-hoehn I have addressed your review.
Do wou want to have another look or should I merge now?

@ghys
Copy link
Member

ghys commented Mar 25, 2024

This looks good to me, but it supposes we are able to make a patch release to OH 3.4 ... @kaikreuzer can we even do that - I'm really not sure?
(I'd argue that we should support 3.4 for a while still, at least for security fixes and some breaking changes, and therefore we should, but whether we're technically able to is another matter...)

because with the introduction of SVG logo support and the conversion of some logos

Wouldn't it be simpler to not remove the PNG versions so that 3.4 instances could still access them, that is, keep the 2 versions, instead of just removing the PNG when adding a SVG (as in openhab/openhab-docs#2256)? If I understand it correctly from #2402, there is no harm in keeping the PNG version around.

@florian-h05
Copy link
Contributor Author

Wouldn't it be simpler to not remove the PNG versions so that 3.4 instances could still access them

Sure, however do I also want to change the doc links so Blockly etc link to the 3.4 docs. Blockly had major changes from 3.4 to 4.0 and I guess it can be confusing to look at the 4.1 docs (at the moment) when clicking on help on openHAB 3.4.

I think it is technically possible to release a 3.4.x patch release.

@stefan-hoehn
Copy link
Contributor

@stefan-hoehn I have addressed your review. Do wou want to have another look or should I merge now?

Sorry, I overlooked your comment. Yes, all good now.

@florian-h05 florian-h05 merged commit dd49b62 into openhab:3.4.x Mar 28, 2024
2 checks passed
@florian-h05 florian-h05 deleted the 3.4.x-docs-link branch March 28, 2024 09:21
@florian-h05 florian-h05 added patch A PR that has been cherry-picked to a patch release branch enhancement New feature or request main ui Main UI labels Mar 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request main ui Main UI patch A PR that has been cherry-picked to a patch release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants