Skip to content

Commit 04bb01b

Browse files
committed
Merge branch 'develop' into 'master' for relase v0.0.2
fixes #2, fixes #3, fixes #4, fixes #5, fixes #6 Signed-off-by: Certseeds <51754303+Certseeds@users.noreply.github.com>
2 parents 0730624 + b15cbda commit 04bb01b

Some content is hidden

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

45 files changed

+1776
-1469
lines changed

.editorconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
tab_width = 4
6+
indent_size = 4
7+
end_of_line = lf
8+
indent_style = space
9+
max_line_length = 120
10+
insert_final_newline = true
11+

.gitattributes

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@
1212
# scripts
1313
*.sh text eol=lf linguist-detectable=false
1414
*.bat text eol=crlf linguist-detectable=false
15+
*.cmd text eol=crlf
16+
*.ps1 text eol=crlf
17+
1518
# Java sources
16-
*.java text diff=java
19+
*.java text diff=java
1720
*.gradle text diff=java
1821
*.gradle.kts text diff=java
1922

@@ -40,4 +43,4 @@
4043
*.jar binary
4144
*.so binary
4245
*.war binary
43-
*.jks binary
46+
*.jks binary

.github/workflows/pull_request.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919
strategy:
2020
matrix:
21-
os: [ ubuntu-18.04, ubuntu-latest ,windows-latest ]
21+
os: [ ubuntu-22.04, ubuntu-latest ,windows-latest ]
2222
steps:
2323
- name: checkout code
24-
uses: actions/checkout@v2
25-
24+
uses: actions/checkout@v3
2625

2726
# The Java version to make available on the path. Takes a whole or semver Java version,
2827
# or 1.x syntax (e.g. 1.8 => Java 8.x).
@@ -31,7 +30,7 @@ jobs:
3130
uses: actions/setup-java@v3
3231
with:
3332
java-version: 11
34-
distribution: 'adopt'
33+
distribution: 'temurin'
3534
cache: 'maven'
3635

3736
- name: Use java and javac
@@ -43,7 +42,7 @@ jobs:
4342

4443
- name: unix-like clean build test
4544
if: ${{ runner.os != 'windows' }}
46-
run: chmod +x ./ mvnw && ./mvnw clean compile test
45+
run: chmod +x ./mvnw.sh && ./mvnw.sh clean compile test
4746

4847
# This workflow contains a single job called "build"
4948
build:
@@ -57,20 +56,20 @@ jobs:
5756

5857
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
5958
- name: checkout code
60-
uses: actions/checkout@v2
59+
uses: actions/checkout@v3
6160

6261
# ensure the path and files of project
6362
- name: ensure the path and files of project
6463
run: sudo apt install tree; tree
6564

6665
- name: Setup Java JDK
67-
uses: actions/setup-java@v2
66+
uses: actions/setup-java@v3
6867
with:
6968
# The Java version to make available on the path. Takes a whole or semver Java version,
7069
#or 1.x syntax (e.g. 1.8 => Java 8.x).
7170
# Early access versions can be specified in the form of e.g. 14-ea, 14.0.0-ea, or 14.0.0-ea.28
7271
java-version: 11
73-
distribution: 'adopt'
72+
distribution: 'temurin'
7473
cache: 'maven'
7574

7675
# - name: run script

.github/workflows/release.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@ jobs:
2323
runs-on: ${{ matrix.os }}
2424
strategy:
2525
matrix:
26-
os: [ ubuntu-18.04, ubuntu-latest ]
26+
os: [ ubuntu-22.04, ubuntu-latest ]
2727
# Steps represent a sequence of tasks that will be executed as part of the job
2828
steps:
2929
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
3030
- name: checkout code
31-
uses: actions/checkout@v2
31+
uses: actions/checkout@v3
3232

3333
- name: Setup Java JDK
3434
uses: actions/setup-java@v3
3535
with:
3636
java-version: 11
37-
distribution: 'adopt'
37+
distribution: 'temurin'
3838
cache: 'maven'
3939

4040
- name: unix-like clean build test
4141
if: ${{ runner.os != 'windows' }}
42-
run: chmod +x ./ mvnw && ./mvnw clean compile test
42+
run: chmod +x ./mvnw.sh && ./mvnw.sh clean compile test
4343

4444
# This workflow contains a single job called "build"
4545
build:
@@ -52,21 +52,21 @@ jobs:
5252
steps:
5353
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
5454
- name: checkout code
55-
uses: actions/checkout@v2
55+
uses: actions/checkout@v3
5656

5757
- name: Setup Java JDK
5858
uses: actions/setup-java@v3
5959
with:
6060
java-version: 11
61-
distribution: 'adopt'
61+
distribution: 'temurin'
6262
cache: 'maven'
6363

6464
- name: Branch name
6565
id: branch_name
6666
run: |
67-
echo ::set-output name=SOURCE_NAME::${GITHUB_REF#refs/*/}
68-
echo ::set-output name=SOURCE_BRANCH::${GITHUB_REF#refs/heads/}
69-
echo ::set-output name=SOURCE_TAG::${GITHUB_REF#refs/tags/}
67+
echo "SOURCE_NAME=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
68+
echo "SOURCE_BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
69+
echo "SOURCE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
7070
- name: tag name output
7171
run: |
7272
echo ${SOURCE_NAME};echo ${SOURCE_BRANCH};echo ${SOURCE_TAG}
@@ -114,12 +114,12 @@ jobs:
114114

115115
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
116116
- name: checkout code
117-
uses: actions/checkout@v2
117+
uses: actions/checkout@v3
118118

119119
- name: Branch name
120120
id: branch_name
121121
run: |
122-
echo ::set-output name=SOURCE_NAME::${GITHUB_REF#refs/*/}
122+
echo "SOURCE_NAME=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
123123
- name: tag name output
124124
run: |
125125
echo ${SOURCE_NAME};
@@ -142,4 +142,4 @@ jobs:
142142
run: |
143143
git add .
144144
git commit -am "release ${{ steps.branch_name.outputs.SOURCE_NAME }}"
145-
git push --set-upstream origin release --force
145+
git push --set-upstream origin release --force

0 commit comments

Comments
 (0)