[Backport release-21.11] discourse: 2.7.9 -> 2.8.0.beta9#149677
Merged
talyz merged 5 commits intorelease-21.11from Dec 9, 2021
Merged
[Backport release-21.11] discourse: 2.7.9 -> 2.8.0.beta9#149677talyz merged 5 commits intorelease-21.11from
talyz merged 5 commits intorelease-21.11from
Conversation
Since building nodejs also builds v8, one way to get a static v8 library is to manually assemble it from the leftover object files. This seems like an easier way to get an up-to-date v8 library than trying to keep the v8 package updated. (cherry picked from commit 679398b)
Also, add support for updating plugins which keep gem versions in files at the root of the repo (discourse-prometheus) and replace the `up-plugin.sh` script with a README file pointing to the plugin packaging documentation. (cherry picked from commit ab042d6)
Add a DiscourseVersion class which handles Discourse's version numbering properly when sorting - beta versions are sorted lower than their respective release versions. It can also return both its version number and equivalent git tag, removing the need for `rev2version` and manually adding `v` to the front. Using DiscourseVersion instead of LooseVersion, we can list all current version number tags from the `discourse` repo and sort them correctly, giving us the latest one, regardless of type; i.e. we don't have to filter for only release versions or beta versions anymore. This also implements the plugin pinning algorithm laid out here: https://meta.discourse.org/t/pinning-plugin-and-theme-versions-for-older-discourse-installs/156971 to make sure we don't upgrade plugins further than what's compatible with our currently packaged Discourse version. While it likely won't matter much most of the time if we continue packaging the beta versions, it could be helpful if we decide to go back to packaging release versions or if we run into issues with future upgrades. In that case, the plugins could still be updated safely even though we're not on the latest version of Discourse. (cherry picked from commit 4fb343c)
Instead of patching the path to /public in Discourse's sources, make the nginx configuration refer to the symlink in the discourse package which points to the real path. When there is a mismatch between the path nginx serves and the path Discourse thinks it serves, we can run into issues like files not being served - at least when sendfile requests from the ruby app are processed by nginx. The issue I ran into most recently is that backup downloads don't work. Since Discourse refers to the public directory relative to the Rails root in many places, it's much easier to just sync this path to the nginx configuration than trying to patch all occurrences in the sources. This should hopefully mean less potential for breakage in future Discourse releases, too. (cherry picked from commit 125bb7d)
13 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Bot-based backport to
release-21.11, triggered by a label in #147506.