Fix source code packaging #19
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
…as env variable (bad behaviour).
andreibancioiu
commented
Jan 23, 2023
| @@ -75,7 +75,7 @@ def run_docker( | |||
| docker_mount_args.extend(["--volume", f"{packaged_src_path}:/packaged-src.json"]) | |||
|
|
|||
| if cargo_target_dir: | |||
| docker_mount_args += ["--volume", f"{cargo_target_dir}:/cargo-target-dir"] | |||
| docker_mount_args += ["--volume", f"{cargo_target_dir}:/rust/cargo-target-dir"] | |||
There was a problem hiding this comment.
Since /rust/cargo-target-dir is used in the Docker image.
andreibancioiu
commented
Jan 23, 2023
| # Clean directory - useful if it contains externally-generated build artifacts | ||
| clean_contract(build_directory) | ||
| build_contract(build_directory, output_subdirectory, cargo_target_dir, no_wasm_opt) | ||
| output_subfolder = parent_output_folder / f"{contract_name}" |
There was a problem hiding this comment.
We've just moved the check if specific_contract and contract_name != specific_contract above.
andreibancioiu
commented
Jan 23, 2023
| def build_contract(build_folder: Path, output_folder: Path, cargo_target_dir: Path, no_wasm_opt: bool): | ||
| cargo_output_folder = build_folder / "output" | ||
| meta_folder = build_folder / "meta" | ||
| cargo_lock = build_folder / "wasm" / "Cargo.lock" |
There was a problem hiding this comment.
We've removed passing CARGO_TARGET_DIR as env (not necessary).
andreibancioiu
commented
Jan 23, 2023
| if return_code != 0: | ||
| exit(return_code) | ||
| raise ErrKnown(f"Failed to build contract {build_folder}. Return code: {return_code}.") |
There was a problem hiding this comment.
Raising error instead of exit-ing.
ccorcoveanu
previously approved these changes
Jan 25, 2023
Removing dev-dependencies, replacing test files
ccorcoveanu
approved these changes
Jan 25, 2023
claudiu725
approved these changes
Jan 25, 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.
meta/Cargo.lockfrom the packaged source code.elrond.jsonandmultiversx.json.contextname in the artifacts (to keep e.g. the Docker image name).