fix: Move target flags after target (#151)

* move target flags after target * fix: tests
input-output-hk · Jan 11, 2024 · 7a775d5 · 7a775d5
1 parent 23c3d7b
commit 7a775d5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/actions/run/dist/index.js b/actions/run/dist/index.js
@@ -2902,9 +2902,6 @@ async function run() {
     if (flags) {
         args.push(...flags.split(' '));
     }
-    if (targetFlags) {
-        args.push(...targetFlags.split(' '));
-    }
     core.info(`Filtered targets >> ${targets}`);
     targets.split(' ').map(tg => {
         // Get the filtered targets associated with the pattern target and earthfile.
@@ -2923,6 +2920,9 @@ async function run() {
         else {
             argsSpawn.push(t);
         }
+        if (targetFlags) {
+            argsSpawn.push(...targetFlags.split(' '));
+        }
         core.info(`Running command: ${command} ${argsSpawn.join(' ')}`);
         const output = await spawnCommand(command, argsSpawn);
         const imageOutput = parseImage(output);

diff --git a/actions/run/src/run.test.ts b/actions/run/src/run.test.ts
@@ -33,7 +33,7 @@ describe('Run Action', () => {
         runnerPort: '',
         targets: 'target',
         targetFlags: '--flag1 test -f2 test2',
-        command: [['--flag1', 'test', '-f2', 'test2', './earthfile+target']],
+        command: [['./earthfile+target', '--flag1', 'test', '-f2', 'test2']],
         imageOutput: '',
         artifactOutput: ''
       },

diff --git a/actions/run/src/run.ts b/actions/run/src/run.ts
@@ -34,10 +34,6 @@ export async function run(): Promise<void> {
     args.push(...flags.split(' '))
   }
 
-  if (targetFlags) {
-    args.push(...targetFlags.split(' '))
-  }
-
   core.info(`Filtered targets >> ${targets}`)
 
   targets.split(' ').map(tg => {
@@ -57,6 +53,11 @@ export async function run(): Promise<void> {
     } else {
       argsSpawn.push(t)
     }
+
+    if (targetFlags) {
+      argsSpawn.push(...targetFlags.split(' '))
+    }
+
     core.info(`Running command: ${command} ${argsSpawn.join(' ')}`)
     const output = await spawnCommand(command, argsSpawn)
     const imageOutput = parseImage(output)