Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 368b18a

Browse files
committed
Merge branch 'main' into develop
# Conflicts: # VERSION # docs/about/authors.md # docs/about/license.md # docs/about/project-details.md # docs/about/support.md # docs/index.md # docs/userguide/advanced_data_comparison.md # docs/userguide/annotations.md # docs/userguide/best-practices.md # docs/userguide/coverage.md # docs/userguide/exception-reporting.md # docs/userguide/expectations.md # docs/userguide/getting-started.md # docs/userguide/install.md # docs/userguide/querying_suites.md # docs/userguide/reporters.md # docs/userguide/running-unit-tests.md # docs/userguide/upgrade.md # sonar-project.properties # source/core/ut_utils.pks
2 parents 7eaffbd + d4225de commit 368b18a

2 files changed

Lines changed: 25 additions & 25 deletions

File tree

.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: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
## Release process
22

3-
With every build, the build process on Travis updates files with an appropriate version number before deployment into the database.
4-
This step is performed, to confirm that the update of versions works properly.
3+
To create a release follow the below steps
54

6-
## To create a release
7-
8-
- create release branch from development branch and make sure to name the release branch: `release/vX.Y.Z`
9-
- update, commit and push at least one file change in the release branch, to kickoff a Travis build
10-
- wait for th build to complete successfully
11-
- merge the release branch to main and wait for main build to complete successfully (do not use Squash/rebase for merge operation)
12-
- create a Github 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.
5+
## 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**.
137
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).
148
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+)
15-
- After A build was completed on a TAG (github release) was successful, merge main branch back into develop branch.
9+
10+
## Performing a release
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)
14+
- 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+
- 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
22-
- changes to those two files are committed and pushed back to release branch by Travis
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.
24+
- changes to those two files are committed and pushed back to release branch
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

27-
Note:
28-
The sources for release are provided in separate zip files delivered from the Travis build process.
29-
The built zip files include HTML documentation generated from MD files.
28+
# Note:
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)