Skip to content

Commit 361df12

Browse files
Merge pull request #82 from dice-group/develop
Developed version 0.1.4
2 parents 3c912cb + da02d06 commit 361df12

File tree

64 files changed

+3292
-492
lines changed

Some content is hidden

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

64 files changed

+3292
-492
lines changed

.editorconfig

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# EditorConfig: http://EditorConfig.org
2+
# top-most EditorConfig file
3+
root = true
4+
5+
# all files defaults
6+
[*]
7+
# Unix-style newlines with a newline ending
8+
end_of_line = lf
9+
insert_final_newline = true
10+
# Set default charset
11+
charset = utf-8
12+
# 4 space indentation
13+
indent_style = space
14+
indent_size = 4
15+
# trim whitespaces
16+
trim_trailing_whitespace = true
17+
# always insert final newline
18+
insert_final_newline = true
19+
20+
[*.md]
21+
trim_trailing_whitespace = false
22+
23+
# tab for makefiles
24+
[{Makefile, Makefile*, *.xml}]
25+
indent_style = tab
26+
indent_size = 4
27+
28+
# 2 spaces for Dockerfiles
29+
[{Dockerfile, Dockerfile*}]
30+
indent_style = space
31+
indent_size = 2
32+
33+
# 2 spaces for md, yaml, ttl, etc..
34+
[*.{md,yml,iml,json,ttl,ts,js,html,css}]
35+
indent_style = space
36+
indent_size = 2

.github/workflows/maven.yml

+5-18
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
branches: [ master, develop ]
1111

1212
jobs:
13-
install-lib:
13+
test-lib:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v2
@@ -28,22 +28,6 @@ jobs:
2828
- name: Compile project
2929
run: mvn clean compile -DskipTests=true -Dmaven.javadoc.skip=true -B -V
3030
working-directory: palmetto
31-
test-lib:
32-
needs: install-lib
33-
runs-on: ubuntu-latest
34-
steps:
35-
- uses: actions/checkout@v2
36-
- name: Set up JDK 11
37-
uses: actions/setup-java@v2
38-
with:
39-
java-version: '11'
40-
distribution: 'adopt'
41-
- name: Cache Maven packages
42-
uses: actions/cache@v2
43-
with:
44-
path: ~/.m2
45-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
46-
restore-keys: ${{ runner.os }}-m2
4731
- name: Run tests
4832
run: mvn jacoco:prepare-agent package -Dmaven.javadoc.skip=true -B jacoco:report
4933
working-directory: palmetto
@@ -52,7 +36,7 @@ jobs:
5236
env:
5337
CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
5438
build-demo:
55-
needs: install-lib
39+
needs: test-lib
5640
runs-on: ubuntu-latest
5741
steps:
5842
- uses: actions/checkout@v2
@@ -67,6 +51,9 @@ jobs:
6751
path: ~/.m2
6852
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
6953
restore-keys: ${{ runner.os }}-m2
54+
- name: install library
55+
run: mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true
56+
working-directory: palmetto
7057
- name: Compile project
7158
run: mvn clean compile -DskipTests=true -Dmaven.javadoc.skip=true -B -V
7259
working-directory: webApp

0 commit comments

Comments
 (0)