Do a hard reset if update fails and try update again

Signed-off-by: Mesbah Alam <Mesbah_Alam@ca.ibm.com>
adoptium · Sep 27, 2022 · 3f04c94 · 3f04c94
1 parent 2b1925c
commit 3f04c94
Showing 1 changed file with 24 additions and 1 deletion.
diff --git a/jck/build.xml b/jck/build.xml
@@ -161,11 +161,34 @@
 									</then>
 								</if>
 								<echo message="Updating ${JCK_ROOT_USED} with latest..." />
-								<exec executable="git" dir="${JCK_ROOT_USED}" failonerror="true">
+								<exec executable="git" dir="${JCK_ROOT_USED}" failonerror="false" resultproperty="return.code">
 									<arg value="pull" />
 									<arg value="${JCK_GIT_REPO_USED}" />
 									<arg value="${jck_branch}" />
 								</exec>
+								<if>
+									<not>
+										<equals arg1="${return.code}" arg2="0"/>
+									</not> 
+									<then>
+										<echo message="Performing hard reset..." />
+										<exec executable="git" dir="${JCK_ROOT_USED}" failonerror="true">
+											<arg value="reset" />
+											<arg value="--hard" />
+											<arg value="origin/master" />
+										</exec>
+										<exec executable="git" dir="${JCK_ROOT_USED}" failonerror="true">
+											<arg value="clean" />
+											<arg value="-f" />
+											<arg value="-d" />
+										</exec>
+										<exec executable="git" dir="${JCK_ROOT_USED}" failonerror="true">
+											<arg value="pull" />
+											<arg value="${JCK_GIT_REPO_USED}" />
+											<arg value="${jck_branch}" />
+										</exec>
+									</then>
+								</if>
 							</else>
 						</if>
 					</else>