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

Skip to content

Commit 45e3b57

Browse files
lwasylowlwasylow
authored
Merge pull request #1310 from utPLSQL/feature/remove_old_builds
Fix to the way the 23 handles the object duration in type plus image fixes.
2 parents 1c85f36 + a7b4d84 commit 45e3b57

3 files changed

Lines changed: 69 additions & 34 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
build:
1818
name: Build and test on ${{matrix.db_version_name}} DB
1919
runs-on: ubuntu-latest
20+
timeout-minutes: 90
2021
env:
2122
ORACLE_VERSION: ${{matrix.oracle-version}}
2223
ORACLE_SID: ${{matrix.oracle-sid}}
@@ -34,12 +35,11 @@ jobs:
3435
- id: 2
3536
db_version_name: '21XE'
3637
oracle-sid: 'XE'
37-
oracle-version: "gvenzl/oracle-xe:21-slim"
38+
oracle-version: "gvenzl/oracle-xe:21-slim-faststart"
3839
- id: 3
3940
db_version_name: '23-free'
4041
oracle-sid: 'FREEPDB1'
41-
oracle-version: "gvenzl/oracle-free:23.26.0-slim"
42-
42+
oracle-version: "gvenzl/oracle-free:23-slim-faststart"
4343
services:
4444
html_checker:
4545
image: ghcr.io/validator/validator:latest
@@ -67,10 +67,10 @@ jobs:
6767
- uses: actions/checkout@v4
6868
with:
6969
fetch-depth: 0
70-
- uses: c-py/action-dotenv-to-setenv@v2
70+
- uses: c-py/action-dotenv-to-setenv@v5
7171
with:
7272
env-file: .github/variables/.env
73-
- uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action
73+
- uses: FranzDiebold/github-env-vars-action@v2.8.0 #https://github.com/marketplace/actions/github-environment-variables-action
7474

7575
- name: Set build version number env variables
7676
id: set-build-version-number-vars
@@ -87,11 +87,27 @@ jobs:
8787
- name: Update privileges on sources
8888
run: chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source}
8989

90+
- name: Cache OJDBC jars
91+
id: cache-ojdbc
92+
uses: actions/cache@v4
93+
with:
94+
path: ${{ env.OJDBC_HOME }}
95+
key: ${{ runner.os }}-ojdbc-${{ env.OJDBC_URL }}-v1
96+
9097
- name: Add OJDBC home
98+
if: steps.cache-ojdbc.outputs.cache-hit != 'true'
9199
id: get-ojdbc
92100
run: mkdir -p ${OJDBC_HOME} && curl -Lk -o ${OJDBC_HOME}/ojdbc8.jar ${OJDBC_URL}/ojdbc8.jar && curl -Lk -o ${OJDBC_HOME}/orai18n.jar ${OJDBC_URL}/orai18n.jar
93101

102+
- name: Cache utPLSQL-cli
103+
id: cache-utplsql-cli
104+
uses: actions/cache@v4
105+
with:
106+
path: utPLSQL-cli
107+
key: ${{ runner.os }}-utplsql-cli-v3.1.8
108+
94109
- name: Install utPLSQL-cli
110+
if: steps.cache-utplsql-cli.outputs.cache-hit != 'true'
95111
id: install-utplsql-cli
96112
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
97113

@@ -167,7 +183,7 @@ jobs:
167183
fail_ci_if_error: true # optional (default = false)
168184

169185
- name: Publish unit test results
170-
uses: EnricoMi/publish-unit-test-result-action@v1.24
186+
uses: EnricoMi/publish-unit-test-result-action@v2
171187
if: always()
172188
with:
173189
files: junit_test_results.xml
@@ -190,6 +206,7 @@ jobs:
190206
needs: [ build ]
191207
concurrency: publish
192208
runs-on: ubuntu-latest
209+
timeout-minutes: 30
193210
env:
194211
API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
195212
if: |
@@ -201,14 +218,14 @@ jobs:
201218
env:
202219
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
203220
run: echo "API_TOKEN_GITHUB=${GITHUB_TOKEN}" >> $GITHUB_ENV
204-
- uses: actions/checkout@v2
221+
- uses: actions/checkout@v4
205222
with:
206223
fetch-depth: 0
207224
token: ${{ env.API_TOKEN_GITHUB }}
208-
- uses: c-py/action-dotenv-to-setenv@v2
225+
- uses: c-py/action-dotenv-to-setenv@v5
209226
with:
210227
env-file: .github/variables/.env
211-
- uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action
228+
- uses: FranzDiebold/github-env-vars-action@v2.8.0 #https://github.com/marketplace/actions/github-environment-variables-action
212229

213230
- name: Set buid version number env variables
214231
id: set-build-version-number-vars
@@ -230,6 +247,12 @@ jobs:
230247
git config --global user.email "github-actions[bot]@users.noreply.github.com"
231248
git config --global user.name "github-actions[bot]"
232249
250+
- name: Setup Python for docs
251+
uses: actions/setup-python@v5
252+
with:
253+
python-version: '3.11'
254+
cache: 'pip'
255+
233256
- name: Build and publish documentation
234257
run: |
235258
pip install mkdocs
@@ -243,6 +266,7 @@ jobs:
243266
concurrency: trigger
244267
needs: [ build, publish ]
245268
runs-on: ubuntu-latest
269+
timeout-minutes: 15
246270
if: |
247271
github.repository == 'utPLSQL/utPLSQL' && github.base_ref == null &&
248272
( startsWith( github.ref, 'refs/heads/release/v' ) || github.ref == 'refs/heads/develop' )
@@ -252,7 +276,7 @@ jobs:
252276
# repo: [ 'utPLSQL/utPLSQL-v2-v3-migration' ]
253277
steps:
254278
- name: Repository Dispatch
255-
uses: peter-evans/repository-dispatch@v1
279+
uses: peter-evans/repository-dispatch@v4
256280
with:
257281
token: ${{ secrets.API_TOKEN_GITHUB }}
258282
repository: ${{ matrix.repo }}
@@ -263,6 +287,7 @@ jobs:
263287
name: Post Workflow Status To Slack
264288
needs: [ build, publish, dispatch ]
265289
runs-on: ubuntu-latest
290+
timeout-minutes: 10
266291
steps:
267292
- name: Slack Workflow Notification
268293
uses: Gamesight/slack-workflow-status@master

‎.github/workflows/release.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@ jobs:
1414
name: Upload archives
1515
concurrency: upload
1616
runs-on: ubuntu-latest
17+
timeout-minutes: 60
1718

1819
steps:
1920
- uses: actions/checkout@v4
2021
with:
2122
fetch-depth: 0
22-
- uses: c-py/action-dotenv-to-setenv@v2
23+
- uses: c-py/action-dotenv-to-setenv@v5
2324
with:
2425
env-file: .github/variables/.env
25-
- uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action
26+
- uses: FranzDiebold/github-env-vars-action@v2.8.0 #https://github.com/marketplace/actions/github-environment-variables-action
2627

2728
- name: Set build version number env variables
2829
run: .github/scripts/set_release_version_numbers_env.sh
@@ -35,6 +36,12 @@ jobs:
3536
git config --global user.email "github-actions[bot]@users.noreply.github.com"
3637
git config --global user.name "github-actions[bot]"
3738
39+
- name: Setup Python for docs
40+
uses: actions/setup-python@v5
41+
with:
42+
python-version: '3.11'
43+
cache: 'pip'
44+
3845
- name: Build and publish documentation
3946
run: |
4047
pip install mkdocs
@@ -69,6 +76,7 @@ jobs:
6976
name: Post Workflow Status To Slack
7077
needs: [ upload_artifacts ]
7178
runs-on: ubuntu-latest
79+
timeout-minutes: 10
7280
steps:
7381
- name: Slack Workflow Notification
7482
uses: Gamesight/slack-workflow-status@master

‎source/core/types/ut_reporter_base.tpb‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -165,52 +165,54 @@ create or replace type body ut_reporter_base is
165165
end;
166166

167167
overriding member procedure on_event( self in out nocopy ut_reporter_base, a_event_name varchar2, a_event_item ut_event_item) is
168+
/* Resolves issue with ORA-21779 being thrown see issue: 1309 -> ( https://github.com/utPLSQL/utPLSQL/issues/1309#issuecomment-4020289898 ) */
169+
l_event_item ut_event_item := a_event_item;
168170
begin
169171
case a_event_name
170172
when ut_event_manager.gc_initialize
171-
then self.on_initialize(treat(a_event_item as ut_run));
173+
then self.on_initialize(treat(l_event_item as ut_run));
172174
when ut_event_manager.gc_before_run
173-
then self.before_calling_run(treat(a_event_item as ut_run));
175+
then self.before_calling_run(treat(l_event_item as ut_run));
174176
when ut_event_manager.gc_before_suite
175-
then self.before_calling_suite(treat(a_event_item as ut_logical_suite));
177+
then self.before_calling_suite(treat(l_event_item as ut_logical_suite));
176178
when ut_event_manager.gc_before_before_all
177-
then self.before_calling_before_all(treat(a_event_item as ut_executable));
179+
then self.before_calling_before_all(treat(l_event_item as ut_executable));
178180
when ut_event_manager.gc_before_before_each
179-
then self.before_calling_before_each(treat(a_event_item as ut_executable));
181+
then self.before_calling_before_each(treat(l_event_item as ut_executable));
180182
when ut_event_manager.gc_before_test
181-
then self.before_calling_test(treat(a_event_item as ut_test));
183+
then self.before_calling_test(treat(l_event_item as ut_test));
182184
when ut_event_manager.gc_before_before_test
183-
then self.before_calling_before_test(treat(a_event_item as ut_executable));
185+
then self.before_calling_before_test(treat(l_event_item as ut_executable));
184186
when ut_event_manager.gc_before_test_execute
185-
then self.before_calling_test_execute(treat(a_event_item as ut_executable));
187+
then self.before_calling_test_execute(treat(l_event_item as ut_executable));
186188
when ut_event_manager.gc_before_after_test
187-
then self.before_calling_after_test(treat(a_event_item as ut_executable));
189+
then self.before_calling_after_test(treat(l_event_item as ut_executable));
188190
when ut_event_manager.gc_before_after_each
189-
then self.before_calling_after_each(treat(a_event_item as ut_executable));
191+
then self.before_calling_after_each(treat(l_event_item as ut_executable));
190192
when ut_event_manager.gc_before_after_all
191-
then self.before_calling_after_all(treat(a_event_item as ut_executable));
193+
then self.before_calling_after_all(treat(l_event_item as ut_executable));
192194
when ut_event_manager.gc_after_run
193-
then self.after_calling_run(treat(a_event_item as ut_run));
195+
then self.after_calling_run(treat(l_event_item as ut_run));
194196
when ut_event_manager.gc_after_suite
195-
then self.after_calling_suite(treat(a_event_item as ut_logical_suite));
197+
then self.after_calling_suite(treat(l_event_item as ut_logical_suite));
196198
when ut_event_manager.gc_after_before_all
197-
then self.after_calling_before_all(treat(a_event_item as ut_executable));
199+
then self.after_calling_before_all(treat(l_event_item as ut_executable));
198200
when ut_event_manager.gc_after_before_each
199-
then self.after_calling_before_each(treat(a_event_item as ut_executable));
201+
then self.after_calling_before_each(treat(l_event_item as ut_executable));
200202
when ut_event_manager.gc_after_test
201-
then self.after_calling_test(treat(a_event_item as ut_test));
203+
then self.after_calling_test(treat(l_event_item as ut_test));
202204
when ut_event_manager.gc_after_before_test
203-
then self.after_calling_before_test(treat(a_event_item as ut_executable));
205+
then self.after_calling_before_test(treat(l_event_item as ut_executable));
204206
when ut_event_manager.gc_after_test_execute
205-
then self.after_calling_test_execute(treat(a_event_item as ut_executable));
207+
then self.after_calling_test_execute(treat(l_event_item as ut_executable));
206208
when ut_event_manager.gc_after_after_test
207-
then self.after_calling_after_test(treat(a_event_item as ut_executable));
209+
then self.after_calling_after_test(treat(l_event_item as ut_executable));
208210
when ut_event_manager.gc_after_after_each
209-
then self.after_calling_after_each(treat(a_event_item as ut_executable));
211+
then self.after_calling_after_each(treat(l_event_item as ut_executable));
210212
when ut_event_manager.gc_after_after_all
211-
then self.after_calling_after_all(treat(a_event_item as ut_executable));
213+
then self.after_calling_after_all(treat(l_event_item as ut_executable));
212214
when ut_event_manager.gc_finalize
213-
then self.on_finalize(treat(a_event_item as ut_run));
215+
then self.on_finalize(treat(l_event_item as ut_run));
214216
else null;
215217
end case;
216218
end;

0 commit comments

Comments
 (0)