Feature/simplified build rebased #2
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
Closed
florianesser-tng
force-pushed
the
feature/simplified-build-rebased
branch
5 times, most recently
from
6e4e080 to
49944fb
Compare
| - name: build installer | ||
| working-directory: "WebUI" | ||
| run: | | ||
| npm install |
There was a problem hiding this comment.
Is this second npm install necessary?
There was a problem hiding this comment.
no, thanks for spotting
| - symlink or copy the conda env path into /python_package_resources | ||
| 3. run ```npm run pack-python``` | ||
|
|
||
| The resulting `WebUI/npm_package_res/env.7z` could be reused for all platforms. | ||
|
|
There was a problem hiding this comment.
In what circumstance does this need to be executed and reference to GitHub action
There was a problem hiding this comment.
I am not sure, if I understand the question. Do you mean, what we do with the env.7z?
This packaged empty is "as is" newly setup python env. It awaits the correct pip install commands to run to enrich for the platform specific) dependencies so the app can bootup the backend. As there are no dependencies installed, this env.7z can be used for any of the builds : arc/ultra/ultra2 and does not need to be rebuilt in general.
The npm build scripts expect this to be present, and so does the github action (at the correct point in time). The build scripts will fail, if it is not present
WebUI/build/scripts/pack-offline.js
Outdated
| const platformSpecificRequirementsTxt = existingFileOrExit(path.join(__dirname, '..', '..', 'service', `requirements-${platform}.txt`)); | ||
| const requirementsTxt = existingFileOrExit(path.join(__dirname, '..', '..', 'service', `requirements-${platform}.txt`)); | ||
| runPipInstall(platformSpecificRequirementsTxt, offlineEnvDir) | ||
| runPipInstall(requirementsTxt, offlineEnvDir) |
There was a problem hiding this comment.
Two identical tasks? Seperations between offline/online
There was a problem hiding this comment.
loaded base requirements.txt for the second runPipInstall
WebUI/build/scripts/pack-offline.js
Outdated
| process.exit(1); | ||
| } | ||
| }); | ||
| } |
There was a problem hiding this comment.
added step to execute get-pip.py
florianesser-tng
force-pushed
the
feature/simplified-build-rebased
branch
2 times, most recently
from
2bca5d0 to
5db0658
Compare
so I can develop on my branch but already test the workflow Signed-off-by: Florian Esser <[email protected]>
- fix bug, where python lib basicsr requires pytorch already being present at pip install time => pip install must be executed in two steps, first install pytorch, then every- thing else - fix file encoding of license.rft: the encoding was some dos specific crosscompiling the electron app caused problems; the license could also not be rendered completely; it contained weird symbols when the installer was compiled from dos system unix fix: iconv -f windows-1252 -t utf-8 license.rft - structure build scripts a little bit, so they are easier to understand - use cross-env in npm commands, so paths specified in package.json work in all envs. Signed-off-by: Florian Esser <[email protected]>
most of the resources required to build the project you can easily get by a simply wget command. The future of the conda dependency is unclear to me hence require manual effort there instead of guessing an incertain solution. Signed-off-by: Florian Esser <[email protected]>
exclude conda dependency from build this is OS dependent Signed-off-by: Florian Esser <[email protected]>
Signed-off-by: Florian Esser <[email protected]>
let OS specifics be handled by action instead of hassling with it. Signed-off-by: Florian Esser <[email protected]>
Signed-off-by: Florian Esser <[email protected]>
Signed-off-by: Florian Esser <[email protected]>
instead of a hardcoded ref, find the installer.exe by file name ending. Signed-off-by: Florian Esser <[email protected]>
by github action Signed-off-by: Florian Esser <[email protected]>
to prevent confusion with and within github actions Signed-off-by: Florian Esser <[email protected]>
small improvements in script and naming Signed-off-by: Florian Esser <[email protected]>
pip installation was missing the same requirements file was executed twice Signed-off-by: Florian Esser <[email protected]>
florianesser-tng
force-pushed
the
feature/simplified-build-rebased
branch
from
5db0658 to
f9c7cfa
Compare
provide scripts, that simply setup a python env This env may be used for developers (on windows machines) Overall flow remains equal, but try to make things a little more obvious my adding named parameters of scripts. Signed-off-by: Florian Esser <[email protected]>
florianesser-tng
force-pushed
the
feature/simplified-build-rebased
branch
from
d51d742 to
836e047
Compare
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.
Provide github build action for reliable and reproducable builds