[Legacy] Sync legacy branch with stable #248
Merged
Conversation
This file contains 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
Reverting spacing changes of 1de0476
- Remove mesh_on_wan from site.conf - default is false anyway
* Make the script idempotent (you can run it again to test patching) * Drop the usage of git branches for patching. The branches were not used and add unncessary complexity * Do not forcefully reset custom commits in gluon-build as part of the patching * Reset the gluon-build environment before applying patches * Do not reset gluon-build environment for debugging if patching failed
In case the gluon-build folder exists and does not contain a .git directory (or file) the following command "git remote set-url origin" will override the git remote of the "main" folder/directory. Avoiding this by checking explicitely for the .git directory inside gluon-build and restructuring the cloning/fetching process. This also speeds up the initial cloning by only fetching the commit required to build. Important legacy-only change: adding git clean -ffdx packages/
When preparation the gluon-build folder was changed from git clone to git fetch, the tags got lost. This is causing the generated fIrmware version not to incluce the gluon version correctly: "v2022.10.4 / gluon-ab1fb05+" instead of "v2022.10.4 / gluon-v2022.1.1+"
Due to stability issues with GitHub runners, try to run without LVM magic, instead just remove some big software packages.
As the Github build is building targets in separate VMs, it does not use the target-list in the Makefile, but holds its own copy instead. This change moves the target list into a new file called "targets" which is then used by the Makefile as well as the Github workflow.
Follow-up of 488c430
grische
force-pushed
the
feature/sync_legacy_with_stable
branch
from
91a97e2 to
398acfd
Compare
|
Confirmed working on WR841ND |
GoliathLabs
approved these changes
Aug 18, 2023
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.
Backported PRs to legacy (4/32) branch:
partially #177
partially #201
#189
#182
#188
#190
#191
#186
#219
#217
#230
#231
#241
#244
#245
#246
#247