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

Skip to content

Commit 7d0ff67

Browse files
lwasylowlwasylow
committed
Merge branch 'develop' of https://github.com/utPLSQL/utPLSQL into feature/remove_old_builds
2 parents a0d1344 + efc5ba8 commit 7d0ff67

24 files changed

Lines changed: 42 additions & 91 deletions

‎.github/workflows/build.yml‎

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,11 @@ jobs:
3636
- id: 2
3737
db_version_name: '21XE'
3838
oracle-sid: 'XE'
39-
oracle-version: "gvenzl/oracle-xe:21-slim-faststart"
40-
oracle-base: '/opt/oracle'
39+
oracle-version: "gvenzl/oracle-xe:21-slim"
4140
- id: 3
4241
db_version_name: '23free'
4342
oracle-sid: 'FREEPDB1'
44-
oracle-version: "gvenzl/oracle-free:23-slim-faststart"
45-
oracle-base: '/opt/oracle'
46-
# TODO - need to add healthcheck.sh into our containers
47-
48-
services:
49-
html_checker:
50-
image: ghcr.io/validator/validator:latest
51-
options: >-
52-
-p 8888:8888
53-
oracle:
54-
image: ${{matrix.oracle-version}}
43+
oracle-version: "gvenzl/oracle-free:23-slim"
5544
env:
5645
ORACLE_PASSWORD: oracle
5746
credentials:
@@ -114,46 +103,46 @@ jobs:
114103
- name: Install utPLSQL-cli
115104
if: steps.cache-utplsql-cli.outputs.cache-hit != 'true'
116105
id: install-utplsql-cli
117-
run: curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/v3.1.8/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli
106+
run: curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/3.1.9/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli
118107

119108
- name: Install utPLSQL
120109
id: install-utplsql
121-
run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/install.sh
110+
run: docker exec -w /utPLSQL ${DOCKER_ENV} oracle .github/scripts/install.sh
122111

123112
- name: Check code style
124113
if: ${{ matrix.db_version_name == '21XE' }}
125114
id: check-coding-style
126-
run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint "$SQLCLI" ${DOCKER_ENV} ${ORACLE_VERSION} $UT3_DEVELOP_SCHEMA/$UT3_DEVELOP_SCHEMA_PASSWORD@//$CONNECTION_STR @development/utplsql_style_check.sql
115+
run: docker exec -w /utPLSQL ${DOCKER_ENV} oracle "$SQLCLI" ${UT3_DEVELOP_SCHEMA}/${UT3_DEVELOP_SCHEMA_PASSWORD}@//${CONNECTION_STR} @/utPLSQL/development/utplsql_style_check.sql
127116

128117
- name: Validate utPLSQL uninstall
129118
if: ${{ matrix.db_version_name == '21XE' }}
130119
id: validate-uninstall
131-
run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/uninstall_validate_utplsql.sh
120+
run: docker exec -w /utPLSQL ${DOCKER_ENV} oracle .github/scripts/uninstall_validate_utplsql.sh
132121

133122
- name: Reinstall utPLSQL
134123
if: ${{ matrix.db_version_name == '21XE' }}
135124
id: reinstall-utplsql
136-
run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/install.sh
125+
run: docker exec -w /utPLSQL ${DOCKER_ENV} oracle .github/scripts/install.sh
137126

138127
- name: Create test users
139128
id: create-test-users
140-
run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/create_test_users.sh
129+
run: docker exec -w /utPLSQL ${DOCKER_ENV} oracle .github/scripts/create_test_users.sh
141130

142131
- name: Install utPLSQL release
143132
id: install-utplsql-release
144-
run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/install_utplsql_release.sh
133+
run: docker exec -w /utPLSQL ${DOCKER_ENV} oracle .github/scripts/install_utplsql_release.sh
145134

146135
- name: Run Examples
147136
id: run-examples
148-
run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/run_examples.sh
137+
run: docker exec -w /utPLSQL ${DOCKER_ENV} oracle .github/scripts/run_examples.sh
149138

150139
- name: Install tests
151140
id: install-tests
152-
run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} test/install_tests.sh
141+
run: docker exec -w /utPLSQL ${DOCKER_ENV} oracle test/install_tests.sh
153142

154143
- name: Run Tests
155144
id: run-tests
156-
run: bash test/run_tests.sh
145+
run: test/run_tests.sh
157146

158147
#Start Needed to diagnose occasional failures of DB on test runs
159148
- name: Prepare diagnostic directory

‎BUILD_NO‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4206
1+
4259

‎CONTRIBUTING.md‎

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -162,44 +162,20 @@ Dependencies to `ut_util` are not shown as most of modules are depending on it.
162162

163163
## Build Environment
164164

165-
We are using private docker images to test utPLSQL for our Travis CI builds. The following versions of Oracle Database are being used.
165+
We are using a combination of private and publicly available docker images to test utPLSQL. The following versions of Oracle Database are used for testing:
166166

167-
* 11g XE R2
168-
* 12c SE R1
169-
* 12c SE R2
170-
* 18c SE
167+
* 19c-Standard Edition (private image)
168+
* 21-free
169+
* 23-free
171170

172-
These images are based on the slimmed versions [official dockerfiles released by Oracle](https://github.com/utPLSQL/docker-scripts), but due to licensing restrictions, we can't make the images public.
173-
You can build your own and use it locally, or push to a private docker repository.
174-
175-
The build steps are simple if you already have some experience using Docker. You can find detailed information about how to build your own image with a running database in: [example of creating an image with pre-built DB](https://github.com/oracle/docker-images/blob/master/OracleDatabase/samples/prebuiltdb/README.md)
176-
177-
> You can find more info about the official Oracle images on the [Oracle Database on Docker](https://github.com/oracle/docker-images/tree/master/OracleDatabase) GitHub page.
171+
The Free varsions are publicly available and you can set up your local development environment to use one of from [here](https://github.com/gvenzl/oci-oracle-free)
178172

179-
> If you are new to Docker, you can start by reading the [Getting Started With Docker](https://docs.docker.com/engine/getstarted/) docs.
173+
These [private image]((https://github.com/utPLSQL/docker-scripts) is a slimmed version of [the official Oracle database dockerfiles](https://github.com/oracle/docker-images/tree/master/OracleDatabase) . Due to licensing restrictions, the image cannot be public.
180174

181-
### Docker Build Notes
182-
183-
* You need to comment out the VOLUME line. This step is required, because volumes are not saved when using `docker commit` command.
184-
* When the build process is complete, you will run the container to install the database. Once everything is set up and you see the message "DATABASE IS READY!", you may change the password and stop the running container. After the container is stopped, you can safely commit the container.
185-
* You can use the --squash experimental docker tag to reduce the image size. Example:
186-
```
187-
docker build --force-rm --no-cache --squash -t oracle/db-prebuilt .
188-
```
189-
190-
Travis will use your Docker Hub credentials to pull the private images, and the following secure environment variables must be defined.
191-
192-
| Variable | Description |
193-
|------------------------------------------|-----------------------------------------------------------------------------------------------|
194-
| **DOCKER_USER**<br />**DOCKER_PASSWORD** | _Your Docker Hub website credentials. They will be used to pull the private database images._ |
195-
196-
### SQLCL
197-
198-
Our build configuration uses SQLCL to run the scripts, and you need to configure a few additional secure environment variables. After the first build, the downloaded file will be cached.
175+
You can build your own and use it locally, or push to a private docker repository.
176+
The build steps are simple if you already have some experience using Docker. You can find detailed information about how to build your own image with a running database in: [example of creating an image with pre-built DB](https://github.com/oracle/docker-images/blob/master/OracleDatabase/samples/prebuiltdb/README.md)
199177

200-
| Variable | Description |
201-
|----------------------------------------------|-------------------------------------------------------------------------|
202-
| **ORACLE_OTN_USER<br />ORACLE_OTN_PASSWORD** | _Your Oracle website credentials. They will be used to download SQLCL._ |
178+
> If you are new to Docker, you can start by reading the [Getting Started With Docker](https://docs.docker.com/get-started/) docs.
203179
204180
## New to GIT
205181

‎docs/about/authors.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.14.4259--develop-blue.svg)
22

33
### utPLSQL v3 Major Contributors
44

‎docs/about/license.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.14.4259--develop-blue.svg)
22

33
# Version Information
44

‎docs/about/project-details.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.14.4259--develop-blue.svg)
22

33
# utPLSQL Project Details
44

‎docs/about/support.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.14.4259--develop-blue.svg)
22

33
# How to get support
44

‎docs/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.14.4259--develop-blue.svg)
22

33
## What is utPLSQL
44

‎docs/userguide/advanced_data_comparison.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.14.4259--develop-blue.svg)
22

33
# Advanced data comparison
44

‎docs/userguide/annotations.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.14.4259--develop-blue.svg)
22

33
Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package.
44
No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit.

0 commit comments

Comments
 (0)