Skip to content

Commit ce89164

Browse files
committed
Merge branch 'develop'
2 parents 81889db + 681bb09 commit ce89164

File tree

109 files changed

+1444
-1666
lines changed

Some content is hidden

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

109 files changed

+1444
-1666
lines changed

.github/workflows/build.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: Build
1+
name: Build and deploy snapshot
22

33
on:
44
push:
5-
branches: [ develop ]
5+
branches-ignore: [ main ]
66
pull_request:
77
branches: [ develop ]
88

@@ -28,17 +28,19 @@ jobs:
2828
2929
steps:
3030
- uses: actions/checkout@v2
31+
with:
32+
fetch-depth: 0
3133

3234
- name: Install utPLSQL
3335
run: sh ${{ github.workspace }}/scripts/1_install_utplsql.sh
3436

3537
- name: Install demo project
3638
run: sh ${{ github.workspace }}/scripts/2_install_demo_project.sh
3739

38-
- name: Set up JDK 8
40+
- name: Set up JDK 11
3941
uses: actions/setup-java@v2
4042
with:
41-
java-version: '8'
43+
java-version: '11'
4244
distribution: 'adopt'
4345
server-id: ossrh
4446
server-username: MAVEN_USERNAME
@@ -54,9 +56,21 @@ jobs:
5456
restore-keys: |
5557
${{ runner.os }}-maven-
5658
59+
- name: Maven unit and integration tests with sonar
60+
run: mvn clean verify sonar:sonar -Pcoverage -Dsonar.projectKey=org.utplsql:utplsql-maven-plugin
61+
env:
62+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
63+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
64+
5765
- name: Maven deploy snapshot
58-
run: mvn org.jacoco:jacoco-maven-plugin:prepare-agent deploy
66+
run: mvn deploy -DskipTests
5967
env:
6068
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
6169
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
6270
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
71+
72+
- name: Publish unit test results
73+
uses: EnricoMi/publish-unit-test-result-action@v1.24
74+
if: always()
75+
with:
76+
files: target/**/TEST**.xml

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build
1+
name: Build and deploy release
22

33
on:
44
push:
@@ -31,10 +31,10 @@ jobs:
3131
- name: Install demo project
3232
run: sh ${{ github.workspace }}/scripts/2_install_demo_project.sh
3333

34-
- name: Set up JDK 8
34+
- name: Set up JDK 11
3535
uses: actions/setup-java@v2
3636
with:
37-
java-version: '8'
37+
java-version: '11'
3838
distribution: 'adopt'
3939
server-id: ossrh
4040
server-username: MAVEN_USERNAME
@@ -51,7 +51,7 @@ jobs:
5151
${{ runner.os }}-maven-
5252
5353
- name: Maven deploy release
54-
run: mvn deploy -Prelease
54+
run: mvn clean deploy -Prelease
5555
env:
5656
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
5757
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}

.travis/.travis.yml_old

Lines changed: 0 additions & 62 deletions
This file was deleted.

.travis/deploy_release.sh

Lines changed: 0 additions & 4 deletions
This file was deleted.

.travis/deploy_snapshot.sh

Lines changed: 0 additions & 4 deletions
This file was deleted.

.travis/install_demo_project.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

.travis/install_utplsql.sh

Lines changed: 0 additions & 14 deletions
This file was deleted.

.travis/maven_cfg.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

.travis/settings.xml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.travis/sql/create_app_objects.sql

Lines changed: 0 additions & 9 deletions
This file was deleted.

.travis/sql/create_source_owner_objects.sql

Lines changed: 0 additions & 6 deletions
This file was deleted.

.travis/sql/create_tests_owner_objects.sql

Lines changed: 0 additions & 7 deletions
This file was deleted.

.travis/sql/create_users.sql

Lines changed: 0 additions & 30 deletions
This file was deleted.

.travis/start_db.sh

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)