Skip to content

Commit c144cca

Browse files
committed
Merge branch 'feature/205_Github_Actions_to_create_release_artifacts' into develop
2 parents 1479bc3 + 0d7aa96 commit c144cca

File tree

3 files changed

+35
-62
lines changed

3 files changed

+35
-62
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: Build and test
2+
23
on:
34
push:
4-
branches: [ develop, feature/github_actions ]
5-
tags:
6-
- v*
5+
76
pull_request:
87
branches: [ develop ]
8+
99
workflow_dispatch:
1010

1111
repository_dispatch:
@@ -67,10 +67,8 @@ jobs:
6767
- name: Install demo project
6868
run: .travis/install_demo_project.sh
6969

70-
- name: Build
71-
run: mvn package -DskipTests
72-
- name: Test
73-
run: mvn package verify jar:jar appassembler:assemble
70+
- name: Build and Test
71+
run: mvn verify jar:jar appassembler:assemble
7472

7573
slack-workflow-status:
7674
if: always()

.github/workflows/release.yml

Lines changed: 11 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,17 @@
11
name: Release
2+
23
on:
34
push:
4-
branches: [ main ]
55
tags:
6-
- v*
6+
- "v*.*.*"
77

88
workflow_dispatch:
99

10-
repository_dispatch:
11-
types: [utPLSQL-build,utPLSQL-java-api-build]
10+
jobs:
1211

13-
defaults:
14-
run:
15-
shell: bash
12+
release:
1613

17-
jobs:
18-
build:
19-
name: Test on JDK ${{ matrix.jdk }} with utPLSQL ${{ matrix.utplsql_version }}
2014
runs-on: ubuntu-latest
21-
env:
22-
ORACLE_VERSION: "gvenzl/oracle-xe:18.4.0-slim"
23-
UTPLSQL_VERSION: ${{matrix.utplsql_version}}
24-
UTPLSQL_FILE: ${{matrix.utplsql_file}}
25-
ORACLE_PASSWORD: oracle
26-
DB_URL: "127.0.0.1:1521:XE"
27-
DB_USER: app
28-
DB_PASS: app
29-
30-
strategy:
31-
fail-fast: false
32-
matrix:
33-
utplsql_version: ["v3.0.1","v3.0.2","v3.0.3","v3.0.4","v3.1.1","v3.1.2","v3.1.3","v3.1.6","v3.1.7","v3.1.8","v3.1.9","v3.1.10","v3.1.11","develop"]
34-
utplsql_file: ["utPLSQL"]
35-
jdk: ['8']
36-
include:
37-
- utplsql_version: "v3.0.0"
38-
jdk: '8'
39-
utplsql_file: "utPLSQLv3.0.0"
40-
services:
41-
oracle:
42-
image: gvenzl/oracle-xe:18.4.0-slim
43-
env:
44-
ORACLE_PASSWORD: oracle
45-
ports:
46-
- 1521:1521
47-
options: >-
48-
--health-cmd healthcheck.sh
49-
--health-interval 10s
50-
--health-timeout 5s
51-
--health-retries 10
52-
--name oracle
5315

5416
steps:
5517
- uses: actions/checkout@v2
@@ -61,16 +23,14 @@ jobs:
6123
java-version: ${{matrix.jdk}}
6224
cache: 'maven'
6325

64-
- name: Install utplsql
65-
run: .travis/install_utplsql.sh
66-
67-
- name: Install demo project
68-
run: .travis/install_demo_project.sh
26+
- name: Build Release
27+
run: mvn package appassembler:assemble assembly:single -DskipTests
6928

70-
- name: Build
71-
run: mvn package -DskipTests
72-
- name: Test
73-
run: mvn verify appassembler:assemble assembly:single
29+
- name: Release
30+
uses: softprops/action-gh-release@v1
31+
with:
32+
files: |
33+
target/utPLSQL-cli.zip
7434
7535
slack-workflow-status:
7636
if: always()

pom.xml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<groupId>org.utplsql</groupId>
66
<artifactId>cli</artifactId>
77
<version>3.1.9-SNAPSHOT</version>
8-
<packaging>jar</packaging>
98

10-
<name>cli</name>
11-
<url>http://maven.apache.org</url>
9+
<name>utPLSQL CLI</name>
10+
<description>CLI for running Unit Tests with utPLSQL v3+.</description>
11+
<url>https://github.com/utPLSQL/utPLSQL-cli</url>
1212

1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -19,6 +19,14 @@
1919
<travisBuildNumber>local</travisBuildNumber>
2020
</properties>
2121

22+
<licenses>
23+
<license>
24+
<name>Apache License, Version 2.0</name>
25+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
26+
<distribution>repo</distribution>
27+
</license>
28+
</licenses>
29+
2230
<dependencies>
2331
<dependency>
2432
<groupId>org.utplsql</groupId>
@@ -87,7 +95,6 @@
8795
<version>2.1</version>
8896
<scope>test</scope>
8997
</dependency>
90-
9198
</dependencies>
9299

93100
<build>
@@ -145,6 +152,14 @@
145152
</descriptors>
146153
</configuration>
147154
</plugin>
155+
<plugin>
156+
<groupId>com.amashchenko.maven.plugin</groupId>
157+
<artifactId>gitflow-maven-plugin</artifactId>
158+
<version>1.18.0</version>
159+
<configuration>
160+
<verbose>true</verbose>
161+
</configuration>
162+
</plugin>
148163
</plugins>
149164
<resources>
150165
<resource>

0 commit comments

Comments
 (0)