Flip build config merge direction (#45)

rustyscreeps · Jan 15, 2024 · cc5d4ab · cc5d4ab
1 parent c8329a1
commit cc5d4ab
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@ Unreleased
 ==========
 
 - Fix merging of `extra_options` configuration in `build` section
+- Fix merging priority of `build` section options
 
 0.5.1 (2023-04-16)
 ==================

diff --git a/src/config.rs b/src/config.rs
@@ -32,7 +32,7 @@ pub struct BuildConfiguration {
     pub build_mode: Option<BuildMode>,
     #[serde(default)]
     pub out_name: Option<String>,
-    #[merge(strategy = merge::vec::append)]
+    #[merge(strategy = merge::vec::prepend)]
     #[serde(default)]
     pub extra_options: Vec<String>,
     #[serde(default)]

diff --git a/src/run.rs b/src/run.rs
@@ -46,15 +46,15 @@ pub fn run() -> Result<(), anyhow::Error> {
                 ModeConfiguration::Copy {
                     destination,
                     branch,
-                    build,
+                    mut build,
                     include_files,
                     prune,
                 } => {
-                    config.build.merge(build);
-                    run_build(&root, &config.build)?;
+                    build.merge(config.build);
+                    run_build(&root, &build)?;
                     run_copy(
                         &root,
-                        &config.build.path,
+                        &build.path,
                         &destination,
                         &branch,
                         &include_files,
@@ -64,7 +64,7 @@ pub fn run() -> Result<(), anyhow::Error> {
                 ModeConfiguration::Upload {
                     authentication,
                     branch,
-                    build,
+                    mut build,
                     include_files,
                     hostname,
                     ssl,
@@ -83,11 +83,11 @@ pub fn run() -> Result<(), anyhow::Error> {
                         }
                     );
 
-                    config.build.merge(build);
-                    run_build(&root, &config.build)?;
+                    build.merge(config.build);
+                    run_build(&root, &build)?;
                     run_upload(
                         &root,
-                        &config.build.path,
+                        &build.path,
                         &authentication,
                         &branch,
                         &include_files,