Merge pull request #175 from dmvict/fix_pre_retry_command

READY: Fix pre retry command
Wandalen · Nov 6, 2024 · 1b18cb0 · 1b18cb0
2 parents 3f9af41 + def8dc6
commit 1b18cb0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/Retry.js b/src/Retry.js
@@ -8,6 +8,7 @@ const _ = wTools;
 function retry( scriptType )
 {
   let shouldRetry = core.getInput( 'retry_condition' ) || true;
+  let isRetry = false;
   const actionName = core.getInput( 'action' );
   const command = core.getMultilineInput( 'command' );
   const preRetryCommand = core.getMultilineInput( 'pre_retry_command' );
@@ -167,7 +168,7 @@ function retry( scriptType )
           if( process.env.GITHUB_OUTPUT && _.fileProvider.fileExists( process.env.GITHUB_OUTPUT ) )
           _.fileProvider.fileWrite( process.env.GITHUB_OUTPUT, '' );
 
-          if( preRetryCommand.length > 0 )
+          if( isRetry && preRetryCommand.length > 0 )
           {
             const o =
             {
@@ -230,6 +231,8 @@ function retry( scriptType )
   {
     _.error.attend( err );
 
+    isRetry = true;
+
     if( _.bool.is( shouldRetry ) )
     return shouldRetry;
     return !!common.evaluateExpression( shouldRetry );

diff --git a/test/Action.test.s b/test/Action.test.s
@@ -918,7 +918,7 @@ function retryWithOptionPreRetryCommand( test )
     test.identical( _.strCount( op.output, /::error::undefined.*Attempts exhausted, made 4 attempts/ ), 0 );
     test.identical( _.strCount( op.output, /::error::.*Process returned exit code/ ), 0 );
     test.identical( _.strCount( op.output, 'Success' ), 1 );
-    test.identical( _.strCount( op.output, 'Executing pre_retry_command' ), 4 );
+    test.identical( _.strCount( op.output, 'Executing pre_retry_command' ), 3 );
     return null;
   });
 
@@ -942,7 +942,7 @@ function retryWithOptionPreRetryCommand( test )
     test.notIdentical( op.exitCode, 0 );
     if( !isTestContainer )
     test.ge( _.strCount( op.output, '::set-env' ), 2 );
-    test.identical( _.strCount( op.output, '::error::Wrong attempt' ), 1 );
+    test.identical( _.strCount( op.output, '::error::Wrong attempt' ), 2 );
     test.identical( _.strCount( op.output, /::error::undefined.*Attempts exhausted, made 4 attempts/ ), 0 );
     test.identical( _.strCount( op.output, /::error::.*Process returned exit code/ ), 1 );
     test.identical( _.strCount( op.output, 'Success' ), 0 );

diff --git a/test/Command.test.s b/test/Command.test.s
@@ -446,7 +446,7 @@ function retryWithOptionPreRetryCommand( test )
     test.notIdentical( op.exitCode, 0 );
     test.identical( _.strCount( op.output, '::error::Please, specify Github action name' ), 0 );
     test.identical( _.strCount( op.output, 'Attempts exhausted, made 4 attempts' ), 1 );
-    test.identical( _.strCount( op.output, 'Executing pre_retry_command' ), 4 );
+    test.identical( _.strCount( op.output, 'Executing pre_retry_command' ), 3 );
     return null;
   });