Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
simasch committed Nov 27, 2021
2 parents 81889db + 681bb09 commit ce89164
Show file tree
Hide file tree
Showing 109 changed files with 1,444 additions and 1,666 deletions.
24 changes: 19 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Build
name: Build and deploy snapshot

on:
push:
branches: [ develop ]
branches-ignore: [ main ]
pull_request:
branches: [ develop ]

Expand All @@ -28,17 +28,19 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0

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

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

- name: Set up JDK 8
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: '8'
java-version: '11'
distribution: 'adopt'
server-id: ossrh
server-username: MAVEN_USERNAME
Expand All @@ -54,9 +56,21 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- name: Maven unit and integration tests with sonar
run: mvn clean verify sonar:sonar -Pcoverage -Dsonar.projectKey=org.utplsql:utplsql-maven-plugin
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

- name: Maven deploy snapshot
run: mvn org.jacoco:jacoco-maven-plugin:prepare-agent deploy
run: mvn deploy -DskipTests
env:
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

- name: Publish unit test results
uses: EnricoMi/[email protected]
if: always()
with:
files: target/**/TEST**.xml
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build
name: Build and deploy release

on:
push:
Expand Down Expand Up @@ -31,10 +31,10 @@ jobs:
- name: Install demo project
run: sh ${{ github.workspace }}/scripts/2_install_demo_project.sh

- name: Set up JDK 8
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: '8'
java-version: '11'
distribution: 'adopt'
server-id: ossrh
server-username: MAVEN_USERNAME
Expand All @@ -51,7 +51,7 @@ jobs:
${{ runner.os }}-maven-
- name: Maven deploy release
run: mvn deploy -Prelease
run: mvn clean deploy -Prelease
env:
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
Expand Down
62 changes: 0 additions & 62 deletions .travis/.travis.yml_old

This file was deleted.

4 changes: 0 additions & 4 deletions .travis/deploy_release.sh

This file was deleted.

4 changes: 0 additions & 4 deletions .travis/deploy_snapshot.sh

This file was deleted.

18 changes: 0 additions & 18 deletions .travis/install_demo_project.sh

This file was deleted.

14 changes: 0 additions & 14 deletions .travis/install_utplsql.sh

This file was deleted.

5 changes: 0 additions & 5 deletions .travis/maven_cfg.sh

This file was deleted.

26 changes: 0 additions & 26 deletions .travis/settings.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .travis/sql/create_app_objects.sql

This file was deleted.

6 changes: 0 additions & 6 deletions .travis/sql/create_source_owner_objects.sql

This file was deleted.

7 changes: 0 additions & 7 deletions .travis/sql/create_tests_owner_objects.sql

This file was deleted.

30 changes: 0 additions & 30 deletions .travis/sql/create_users.sql

This file was deleted.

14 changes: 0 additions & 14 deletions .travis/start_db.sh

This file was deleted.

Loading

0 comments on commit ce89164

Please sign in to comment.