Skip to content

Commit 85e2b7c

Browse files
jgebaljgebal
authored
Merge pull request utPLSQL#356 from utPLSQL/release/v3.0.1
Release/v3.0.1
2 parents e8aa109 + 0dc95b9 commit 85e2b7c

File tree

66 files changed

+695
-266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+695
-266
lines changed

‎.travis.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ env:
2222
global:
2323
- UT3_OWNER=ut3
2424
- UT3_OWNER_PASSWORD=ut3
25-
- UT3_USER=ut3_user
25+
- UT3_USER="UT3\$USER#"
2626
- UT3_USER_PASSWORD=ut3
2727
- UT3_TABLESPACE=users
2828
# Environment for building a release
@@ -80,8 +80,10 @@ deploy:
8080
provider: releases
8181
api_key: $github_api_token
8282
file:
83-
- utPLSQL${UTPLSQL_BUILD_VERSION}.zip
84-
- utPLSQL${UTPLSQL_BUILD_VERSION}.tar.gz
83+
- utPLSQL.zip
84+
- utPLSQL.tar.gz
85+
- utPLSQL.zip.md5
86+
- utPLSQL.tar.gz.md5
8587
skip_cleanup: true
8688
on:
8789
repo: ${UTPLSQL_REPO}

‎.travis/build_release_archive.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ mv -f .gitattributes.release .gitattributes
99
git add .
1010
git commit -m "tmp commit for building a release archive"
1111

12-
git archive --prefix="utPLSQL${UTPLSQL_BUILD_VERSION}"/ -o "utPLSQL${UTPLSQL_BUILD_VERSION}".zip --format=zip HEAD
13-
git archive --prefix="utPLSQL${UTPLSQL_BUILD_VERSION}"/ -o "utPLSQL${UTPLSQL_BUILD_VERSION}".tar.gz --format=tar.gz HEAD
12+
# git archive --prefix="utPLSQL${UTPLSQL_BUILD_VERSION}"/ -o "utPLSQL${UTPLSQL_BUILD_VERSION}".zip --format=zip HEAD
13+
# git archive --prefix="utPLSQL${UTPLSQL_BUILD_VERSION}"/ -o "utPLSQL${UTPLSQL_BUILD_VERSION}".tar.gz --format=tar.gz HEAD
1414

15+
git archive --prefix=utPLSQL/ -o utPLSQL.zip --format=zip HEAD
16+
git archive --prefix=utPLSQL/ -o utPLSQL.tar.gz --format=tar.gz HEAD
17+
md5sum utPLSQL.zip --tag > utPLSQL.zip.md5
18+
md5sum utPLSQL.tar.gz --tag > utPLSQL.tar.gz.md5
1519

‎.travis/get_project_build_version.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env bash
2-
echo `sed -r "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)/\1\2\3\.${UTPLSQL_BUILD_NO}\4/" <<< "${UTPLSQL_VERSION}"`
2+
echo `sed -r "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/" <<< "${UTPLSQL_VERSION}"`

‎.travis/install.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ set verify off
1111
@../source/create_utplsql_owner.sql $UT3_OWNER $UT3_OWNER_PASSWORD $UT3_TABLESPACE
1212
--needed for Mystats script to work
1313
grant select any dictionary to $UT3_OWNER;
14+
--Needed for testing a coverage outside ut3_owner.
15+
grant create any procedure, execute any procedure to $UT3_OWNER;
16+
1417
@../source/create_utplsql_owner.sql $UT3_USER $UT3_USER_PASSWORD $UT3_TABLESPACE
18+
1519
cd ..
1620
1721
--enable plsql debug

‎.travis/push_docs_to_gh_pages.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ LATEST_DOCS_BRANCH="develop"
2020
# Since we are running job matrix, only thie first job slave will need to do the work
2121
if [[ "${TRAVIS_JOB_NUMBER}" =~ \.1$ ]]; then
2222
# We don't want a pull request automatically updating the repository
23-
if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "${CURRENT_BRANCH}" == "${LATEST_DOCS_BRANCH}" ]; then
23+
if [ "$TRAVIS_PULL_REQUEST" == "false" ] && { [ "${CURRENT_BRANCH}" == "${LATEST_DOCS_BRANCH}" ] || [ -n "${TRAVIS_TAG}" ]; }; then
2424

2525
# ENV Variable checks are to help with configuration troubleshooting, they silently exit with unique message.
2626
# Anyone one of them not set can be used to turn off this functionality.

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v3.0.0
1+
v3.0.1

‎development/readme.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Build Folder
22

3-
Contains the build scripts that can be run locally on a developers machine to build run and test utPLSQL.
3+
Contains the build scripts that can be run locally on a developer's machine to build, run and test utPLSQL.
44

5-
These scripts are also used by Jenkins Continuous integration server to check each pull request before it is merged.
5+
These scripts are also used by the Jenkins Continuous Integration server to check each pull request before it is merged.
66

‎development/releasing.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
Release process is automated in following way:
2-
1) with every build, the build process on travis updatse files with appropriate version number before deployment into db.
1+
The release process is automated in the following way:
2+
1) With every build, the build process on Travis updates files with an appropriate version number before deployment into the database.
33
This is to confirm that the update of versions works properly.
4-
2) when build is executed on a branch named `release/v1.2.3-something` then additional steps are taken:
5-
- project version in files: `sonar-project.properties`, `VERSION` is updated from the version number derived from release branch
6-
- changes on those two files are committed and and pushed - this should happen only once, when the release branch is initially created on the main repo
4+
2) When a build is executed on a branch named `release/v1.2.3-something` then additional steps are taken:
5+
- the project version in files: `sonar-project.properties`, `VERSION` is updated from the version number derived from the release branch
6+
- changes to those two files are committed and pushed - this should happen only once, when the release branch is initially created on the main repo
77
3) To create a release, just create a tag on the code to be released. The tag name must match the regex pattern: `^v[0-9]+\.[0-9]+\.[0-9]+.*$`
88
- When a tag build is executed, the documentation is built and files are uploaded to the tag.
99
- The version number is derived from the tag name.
10-
4) Release version do not provide access to unversioned source files (the default zip file from github is empty).
11-
The sources for release are provided in separate zip files delivered from travis build process.
10+
4) The release version does not provide access to unversioned source files (the default zip file from GitHub is empty).
11+
The sources for release are provided in separate zip files delivered from the Travis build process.

‎docs/about/CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## How to contribute ##
22

3-
The following are the guidelines, everyone should use to contribute to utPLSQL.
3+
The following are the guidelines everyone should use to contribute to utPLSQL.
44
Changes are welcome from all members of the Community.
55

66
## Getting Started ##

‎docs/about/support.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# How to get support
22

3-
- Feel free post questions, bugs or issues in the [issues area of GitHub](https://github.com/utPLSQL/utPLSQL/issues).
4-
- Join developers the [utPLSQL team](http://utplsql-slack-invite.herokuapp.com) on [Slack](https://slack.com/)
3+
- Feel free to post questions, bugs or issues in the [issues area of GitHub](https://github.com/utPLSQL/utPLSQL/issues)
4+
- Join developers at the [utPLSQL team](http://utplsql-slack-invite.herokuapp.com) on [Slack](https://slack.com/)

0 commit comments

Comments
 (0)