Ignore rust-toolchain in workspace root

Author: rasmus-kirk

.gitignore

@@ -21,6 +21,8 @@ pkg
 *.state
 **/.idea
 
+**/concordium-out
+
 **/*.nix
 **/flake.lock
 **/result

cargo-concordium/CHANGELOG.md

@@ -3,7 +3,8 @@
 ## Unreleased
 
 - Support specifying a profile using the `--profile` flag.
-- Support for workspaces.
+- Building/testing a single package in a workspace is now possible by calling
+  `cargo concordium` from the smart contract directory in the workspace.
 
 ## 4.2.0
 

cargo-concordium/src/build.rs

@@ -292,7 +292,12 @@ fn build_in_container(
     {
         target_dir = target_dir.canonicalize()?;
     };
-    let tar_archive = create_archive(package, workspace_root, &[out_path, tar_path, &target_dir])?;
+    let toolchain_file = workspace_root.join("rust-toolchain.toml");
+    let tar_archive = create_archive(
+        package,
+        workspace_root,
+        &[out_path, tar_path, &target_dir, &toolchain_file],
+    )?;
 
     let archive_hash = sha2::Sha256::digest(&tar_archive.tar_archive);
 
@@ -1155,7 +1160,9 @@ pub(crate) fn build_and_run_integration_tests(
     };
     crate::handle_build(build_options.clone(), false)?;
     let metadata = get_crate_metadata(&cargo_args)?;
-    let package = metadata.root_package().unwrap();
+    let package = metadata
+        .root_package()
+        .context("Unable to determine root package")?;
     let build_info = build_contract(build_options.clone(), &cargo_args, package, &metadata)?;
 
     let cargo_args = build_options.cargo_args.clone();
@@ -1443,7 +1450,10 @@ pub fn build_and_run_wasm_test(
     }
 }
 
-// NOTE: This seems to not work if there's a rust-toolchain file
+// NOTE: This seems to not work if there's a rust-toolchain file, reproducible
+// builds still fail without proper error messages if a toolchain file is
+// provided without the wasm target.
+//
 /// Checks if the `wasm32-unknown-unknown` target is installed, and returns an
 /// error if not.
 fn check_wasm_target() -> anyhow::Result<()> {

cargo-concordium/src/main.rs

@@ -1015,6 +1015,7 @@ fn handle_print_build_info(source: PathBuf) -> anyhow::Result<()> {
     Ok(())
 }
 
+/// Handles the build of a single package.
 fn handle_package(
     build_info: &BuildInfo,
     options: &BuildOptions,
@@ -1163,24 +1164,23 @@ fn handle_package(
     Ok(())
 }
 
-/// Get a list of packages in the workspace from the metadata.
-/// If it's a non-workspace package, get the single package.
+/// Gets the `root_package` from the workspace i.e. the package of the current dir.
+///
+/// It returns a `Vec<Package>` to support getting all the packages in the
+/// workspace if there is no `root_package`.
 fn get_packages(metadata: &Metadata) -> anyhow::Result<Vec<Package>> {
     let root_package = metadata.root_package();
     if let Some(package) = root_package {
         Ok(vec![package.clone()])
     } else {
-        let smart_contract_pkgs: Vec<Package> =
-            metadata.workspace_packages().into_iter().cloned().collect();
-        if smart_contract_pkgs.is_empty() {
-            Ok(smart_contract_pkgs)
-        } else {
-            bail!("Error: No package found!");
-        }
+        bail!("Error: No package found!");
     }
 }
 
 /// Build the smart contract module using the provided options.
+/// If it's in a workspace context it will build the smart contract in the
+// current directory, if one exists otherwise it will build all smart contracts
+// in the workspace.
 ///
 /// This method is used by both the build and test command.
 /// When building, i.e. when running `cargo concordium build`, the schema