Merge branch 'improvement/restore-cache-before-artifacts' into 'master'

Restore cache before artifacts

Closes #2379

See merge request !577

common/build.go

@@ -204,10 +204,10 @@ func (b *Build) executeScript(ctx context.Context, executor Executor) error {
 		err = b.attemptExecuteStage(ctx, BuildStageGetSources, executor, b.GetGetSourcesAttempts())
 	}
 	if err == nil {
-		err = b.attemptExecuteStage(ctx, BuildStageDownloadArtifacts, executor, b.GetDownloadArtifactsAttempts())
+		err = b.attemptExecuteStage(ctx, BuildStageRestoreCache, executor, b.GetRestoreCacheAttempts())
 	}
 	if err == nil {
-		err = b.attemptExecuteStage(ctx, BuildStageRestoreCache, executor, b.GetRestoreCacheAttempts())
+		err = b.attemptExecuteStage(ctx, BuildStageDownloadArtifacts, executor, b.GetDownloadArtifactsAttempts())
 	}
 
 	if err == nil {

common/build_test.go

@@ -245,7 +245,7 @@ func TestArtifactDownloadRunFailure(t *testing.T) {
 
 	// Fail a build script
 	e.On("Shell").Return(&ShellScriptInfo{Shell: "script-shell"})
-	e.On("Run", mock.Anything).Return(nil).Times(2)
+	e.On("Run", mock.Anything).Return(nil).Times(3)
 	e.On("Run", mock.Anything).Return(errors.New("build fail")).Times(3)
 	e.On("Finish", errors.New("build fail")).Return().Once()
 
@@ -283,7 +283,7 @@ func TestRestoreCacheRunFailure(t *testing.T) {
 
 	// Fail a build script
 	e.On("Shell").Return(&ShellScriptInfo{Shell: "script-shell"})
-	e.On("Run", mock.Anything).Return(nil).Times(3)
+	e.On("Run", mock.Anything).Return(nil).Times(2)
 	e.On("Run", mock.Anything).Return(errors.New("build fail")).Times(3)
 	e.On("Finish", errors.New("build fail")).Return().Once()