Skip to content

Commit

Permalink
Merge pull request #49 from virtualsatellite/integration
Browse files Browse the repository at this point in the history
Release 4.12.0
  • Loading branch information
SaMuellerDLR authored Jul 31, 2020
2 parents 527bf87 + 61fd763 commit 961b9e1
Show file tree
Hide file tree
Showing 28 changed files with 746 additions and 701 deletions.
Original file line number Diff line number Diff line change
@@ -1,24 +1,33 @@
Virtual Satellite Release Version 4.x.x

This ticket captures all release related work of the VirtualSatellite4-DEV-IDE release

1. Perform version update:
- [ ] Checkout/Update the Development branch
- [ ] Remove current integration branch (Make sure no one else is integrating at the moment)
- [ ] Create new integration branch from development branch
- [ ] Run ant script to update version numbers
- [ ] Merge integration branch into development branch (Pull Request named "Integration 4.x.x - Remerge Versions")

2. Perform integration on integration branch:
- [ ] Apply all needed fixes
- [ ] Update the release notes

3. Update master/release branch:
- [ ] Merge integration branch into master branch (Pull Request named "Release 4.x.x")
- [ ] Create Release Tag

4. Merge back integration branch:
- [ ] Merge integration branch into development branch (Pull Request named "Integration 4.x.x - Remerge Fixes")

Well Done!! You should have a new Virtual Satellite Developer IDE Release :rocket:

---
name: Release
about: Create a Release for a new Version of Virtual Satellite IDE
title: 'Release Version 4.x.x '
labels: release
assignees: ''

---

Virtual Satellite Release Version 4.x.x

This ticket captures all release related work of the VirtualSatellite4-DEV-IDE release

1. Perform version update:
- [ ] Checkout/Update the Development branch
- [ ] Remove current integration branch (Make sure no one else is integrating at the moment)
- [ ] Create new integration branch from development branch
- [ ] Run ant script to update version numbers
- [ ] Merge integration branch into development branch (Pull Request named "Integration 4.x.x - Remerge Versions")

2. Perform integration on integration branch:
- [ ] Apply all needed fixes
- [ ] Update the release notes

3. Update master/release branch:
- [ ] Merge integration branch into master branch (Pull Request named "Release 4.x.x")
- [ ] Create Release Tag

4. Merge back integration branch:
- [ ] Merge integration branch into development branch (Pull Request named "Integration 4.x.x - Remerge Fixes")

Well Done!! You should have a new Virtual Satellite Developer IDE Release :rocket:

12 changes: 12 additions & 0 deletions .github/ISSUE_TEMPLATE/default.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
name: Default
about: Create a report to help us improve
title: 'Issue ... '
labels:
assignees: ''

---

**Description**
A clear and concise description of what this ticket is about.

4 changes: 2 additions & 2 deletions .settings/org.eclipse.core.runtime.prefs
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
eclipse.preferences.version=1
line.separator=\n
eclipse.preferences.version=1
line.separator=\r\n
Loading

0 comments on commit 961b9e1

Please sign in to comment.