Skip to content

Commit c62d69c

Browse files
committed
Updated releasing.md and .gitattributes files.
1 parent 6ba87ac commit c62d69c

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

.gitattributes

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1+
.github export-ignore
2+
.idea export-ignore
3+
development export-ignore
4+
test export-ignore
15
.gitattributes export-ignore
26
.gitignore export-ignore
37
.gitmodules export-ignore
4-
.travis.yml export-ignore
58
mkdocs.yml export-ignore
6-
.travis export-ignore
7-
.github export-ignore
89
sonar-project.properties export-ignore
9-
tests export-ignore
10-
development export-ignore
11-
node_modules export-ignore
12-
^docs/* linguist-documentation
10+
^docs/** linguist-documentation
1311
*.pkb linguist-language=PLSQL
1412
*.pks linguist-language=PLSQL
1513
*.sql linguist-language=PLSQL
1614
*.tpb linguist-language=PLSQL
1715
*.tps linguist-language=PLSQL
16+
*.sh text eol=lf

development/releasing.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,28 @@
33
To create a release follow the below steps
44

55
## Release preparation
6-
- create a draft of Release from the `main` branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests **since previous release**.
6+
- Create a **draft** of Release from the `main` branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests **since previous release**.
77
To find issues closed after certain date use [advanced filters](https://help.github.com/articles/searching-issues-and-pull-requests/#search-by-open-or-closed-state).
88
Example: [`is:issue closed:>2018-07-22`](https://github.com/utPLSQL/utPLSQL/issues?utf8=%E2%9C%93&q=is%3Aissue+closed%3A%3E2018-07-22+)
99

1010
## Performing a release
11-
- create release branch from development branch and make sure to name the release branch: `release/vX.Y.Z`
12-
- update, commit and push at least one file change in the release branch, to kick off a build on [GithubActions](https://github.com/utPLSQL/utPLSQL/actions)
13-
- wait for the build to complete successfully
11+
- create the release branch from `develop` branch and make sure to name the release branch: `release/vX.Y.Z`
12+
- update, commit and push at least one file change in the release branch, to kick off a build on [GithubActions](https://github.com/utPLSQL/utPLSQL/actions) or kick-off a build manually for that branch after it was created on github.
13+
- wait for the build to complete successfully as it will update the version to be release number (without develop)
1414
- merge the release branch to `main` branch and wait for build on `main` branch to complete successfully (do not use Squash/rebase for merge operation)
15-
- After A build was completed on a TAG (github release) was successful, merge main branch back into develop branch.
15+
- Publish the release on the `main` branch and tag it with version number `vX.Y.Z`
16+
- Wait for the release build to finish successfully on Github Actions as this will upload release artifacts (`zip` and `tar.gz` files along with `md5`)
17+
- After A Release build was completed successfully, merge main branch back into develop branch.
1618
- At this point, main branch and release tag should be at the same commit version and artifacts should be uploaded into Github release.
17-
- After develop branch was built, update version number in `VERSION` file to represent next planned release version.
19+
- After develop branch was built, increase the version number in `VERSION` file to represent next planned release version.
1820
- Clone `utplsql.githug.io` project and add a new announcement about next version being released in `_posts`. Use previous announcements as a template. Make sure to set date, time and post title properly.
1921

2022
The following will happen:
2123
- build executed on branch `release/vX.Y.Z-[something]` updates files `sonar-project.properties`, `VERSION` with project version derived from the release branch name
2224
- changes to those two files are committed and pushed back to release branch
23-
- builds on main branch are **not getting executed**
24-
- when a Github release is created, a new tag is added in on the repository and a tag build is executed
25-
- the documentation for new release is published on `utplsql.github.io` and installation archives are added to the tag.
25+
- when a Github release is published, a new tag is added in on the repository and a release build is executed
26+
- With Release build, the documentation for new release is published on `utplsql.github.io` and installation archives are added to the release.
2627

2728
# Note:
28-
The sources for release are provided in separate zip files delivered by the build process.
29-
The built zip files include HTML documentation generated from MD files.
29+
The utPLSQL installation files are uploaded by the release build process as release artifacts (separate `zip` and `tar.gz` files).
30+
The release artifacts include HTML documentation generated from MD files, sources and tests

0 commit comments

Comments
 (0)