Project

General

Profile

Actions
Copy link

bug #6255

closed

jenkins job cdm-webapp-HFX-FINISH fails due to merge conflict

Added by Andreas Kohlbecker over 7 years ago. Updated almost 7 years ago.

Status:
Closed
Priority:
Highest
Assignee:
Andreas Kohlbecker
Category:
devOps
Target version:
Release 4.6
Start date:
Due date:
% Done:

0%

Estimated time:
Severity:
normal
Found in Version:

Description

jenkins job cdm-webapp-HFX-FINISH fails due to merge conflict on merging master back to develop. The conflict occurs in the pom.xml at the project version.

Using the same strategy as in cdmlib-HFX-FINISH does not work since -DnoReleaseMerge=true is not affecting the hotfix-finish goal.

It seems we need to use the gitflow shelĺ scripts for reliable HFX releases.

Actions
Copy link
 #1

Updated by Andreas Kohlbecker over 7 years ago

  • Description updated (diff)
Actions
Copy link
 #2

Updated by Andreas Müller over 7 years ago

  • Target version changed from Release 4.5 to Release 4.6
Actions
Copy link
 #3

Updated by Andreas Kohlbecker over 7 years ago

  • Status changed from New to Resolved

I created a new job based on taxeditor-HFX-FINISH, the old one is preserved as cdm-webapp-HFX-FINISH (BACKUP) which is disabled and can be deleted once the new job has run successfully.

Actions
Copy link
 #4

Updated by Andreas Kohlbecker almost 7 years ago

  • Status changed from Resolved to Closed

all done and cleaned up - closing the ticket

Actions
Copy link

Also available in: Atom PDF