...
| Kodblock |
|---|
─$ git flow feature start SKLTP-123
Switched to a new branch 'feature/SKLTP-123'
Summary of actions:
- A new branch 'feature/SKLTP-123' was created, based on 'develop'
- You are now on branch 'feature/SKLTP-123'
Now, start committing on your feature. When done, use:
git flow feature finish SKLTP-123 |
Dela en feature branch
Obs: Om ni har gjort ändringar innan publish/push då ni måste pusha kod först till remote.
| 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' |
Stega 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.
╰─$ mvn release:update-versions -DdevelopmentVersion=x.x+1.x-SNAPSHOT
╰─$ git commit -a -m "Updated pom version on feature branch before merge"
╰─$ git push |
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' |
...
Stega upp version i källkoden (pom.xml) genom att köra update-versions och slutföra med git flow release publish så att andra utvecklare kan se den
| Kodblock |
|---|
╰─$ mvn org.apache.maven.plugins:maven-release-plugin:2.5.3:update-versions -DdevelopmentVersion=x.x.x-RC1-SNAPSHOT ╰─$ git commit -a -m "Updated pom version to RC1-SNAPSHOT" ╰─$ git flow release publish 1.0.0 |
Release RC version:er
| Kodblock |
|---|
╰─$ mvn org.apache.maven.plugins:maven-release-plugin:2.5.3:prepare -DtagNameFormat=@{project.version} ╰─$ mvn org.apache.maven.plugins:maven-release-plugin:2.5.3:perform -Darguments="-Dmaven.deploy.skip=true" eller om man har behörighet att checka in på Nexus ╰─$ mvn org.apache.maven.plugins:maven-release-plugin:2.5.3:perform ╰─$ git commit -a -m "Working on RC versions" ╰─$ git push --all |
...
| Kodblock |
|---|
╰─$ mvn versions:set -DnewVersion=1.0.0 -DgenerateBackupPoms=false
╰─$ mvn commit -a -m "Updated pom version to final version, no more RC's"
╰─$ git push --all
╰─$ mvn org.apache.maven.plugins:maven-release-plugin:2.5.3:prepare -DtagNameFormat=@{project.version}
╰─$ mvn org.apache.maven.plugins:maven-release-plugin:2.5.3:perform -Darguments="-Dmaven.deploy.skip=true"
eller om man har behörighet att checka in på Nexus
╰─$ mvn release:perform |
...