Jämförda versioner

Nyckel

  • Dessa rader lades till.
  • Denna rad togs bort.
  • Formateringen ändrades.

...

Kodblock
╰─$ git flow feature publish SKLTP-123
Total 0 (delta 0), reused 0 (delta 0)
To git@github.com:skltp-aggregerandetjanster/riv.clinicalprocess.healthcond.basic.GetAggregatedObservation.git
 * [new branch]      feature/SKLTP-123 -> feature/SKLTP-123
Already on 'feature/SKLTP-123'
Your branch is up-to-date with 'origin/feature/SKLTP-123'.
Summary of actions:
- A new remote branch 'feature/SKLTP-123' was created
- The local branch 'feature/SKLTP-123' was configured to track the remote branch
- You are now on branch 'feature/SKLTP-123'

Färdigställ en feature branchStega upp version i källkoden (pom.xml) genom att köra update-versions. Det ska säkerställa att vi har rätt version i pom filerna i develop när kod blir mergat från feature till develop.

Kodblock
╰─$ mvn release:update-versions -DdevelopmentVersion=x.x+1.x-SNAPSHOT 
╰─$ git commit -a -m "Updated pom version on feature branch before merge"
╰─$ git push

Stega upp version i källkoden (pom.xml). Det ska säkerställa att vi har rätt version i pom filerna i develop när kod blir mergat från feature till develop Färdigställ en feature branch

Kodblock
╰─$ git flow feature finish SKLTP-123
Switched to branch 'develop'
Already up-to-date.
Deleted branch feature/SKLTP-123 (was 039205e).
Summary of actions:
- The feature branch 'feature/SKLTP-123' was merged into 'develop'
- Feature branch 'feature/SKLTP-123' has been removed
- You are now on branch 'develop'

Göra en release (release branch)

Starta en release branch

Ersätta 1.0.0 med lämplig version nummer. 

Kodblock
─$ git-flow release start 1.0.0
Switched to a new branch 'release/1.0.0'
Summary of actions:
- A new branch 'release/v1.0.0' was created, based on 'develop'
- You are now on branch 'release/1.0.0'
Follow-up actions:
- Bump the version number now!
- Start committing last-minute fixes in preparing your release
- When done, run:
     git flow release finish '1.0.0'

...

Kodblock
╰─$ mvn release:prepare -DtagNameFormat=@{project.version}
 
╰─$ mvn release:perform -Darguments="-Dmaven.deploy.skip=true"
	eller om man har behörighet att checka in på Nexus
╰─$ mvn release:perform
╰─$ git push --all

...

Kodblock
╰─$ git status
On branch release/1.0.0
No changes to be committed:
Kodblock

 
╰─$ git tag
1.0.0-RC1

Release utan RC version:er. Final release. 

...

Kodblock
╰─$ mvn release:update-versions -DdevelopmentVersion=1.0.0
╰─$ git commit -a -m "Updated pom version to final version"
╰─$ git push
╰─$ mvn release:prepare -DtagNameFormat=@{project.version}

╰─$ mvn release:perform -Darguments="-Dmaven.deploy.skip=true"
	eller om man har behörighet att checka in på Nexus
╰─$ mvn release:perform

Stega upp version i källkoden (pom.xml) genom att köra update-versions igen

Kodblock
╰─$ mvn release:update-versions -DdevelopmentVersion=1.1.0-SNAPSHOT 
╰─$ git commit -a -m "Updated pom version to 1.1.0-SNAPSHOT"
╰─$ git push --all

...

Kodblock
╰─$ git status
On branch release/1.0.0
No changes to be committed:
Kodblock

 
╰─$ git tag
1.0.0
1.0.0-RC1

Färdiställ release branch

Kodblock
╰─$ git flow release finish -n -p

...