Skip to content

Commit

Permalink
Merge pull request #61 from whelk-io/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
zteater committed Oct 26, 2020
2 parents a5c63af + 27f9e20 commit d013660
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ jobs:

steps:

- uses: actions/[email protected].1
- uses: actions/[email protected].3
with:
fetch-depth: 2

- run: git checkout HEAD^

- name: Set up JDK 1.8
uses: actions/setup-java@v1
uses: actions/setup-java@v1.4.2
with:
java-version: 1.8

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:

- uses: actions/[email protected].1
- uses: actions/[email protected].3
with:
fetch-depth: 2

Expand All @@ -21,7 +21,7 @@ jobs:
git checkout master
- name: Set up JDK 1.8
uses: actions/setup-java@v1
uses: actions/setup-java@v1.4.2
with:
java-version: 1.8

Expand All @@ -46,15 +46,15 @@ jobs:
-d '{ "tag_name": "'$version'", "target_commitish": "master", "name": "'$version'", "body": "Release deployment", "draft": false, "prerelease": false }'
- name: Create Maven settings.xml
uses: whelk-io/maven-settings-xml-action@v9
uses: whelk-io/maven-settings-xml-action@v12
with:
servers: '[{"id": "github", "username": "${{ secrets.BUILD_USERNAME }}", "password": "${{ secrets.BUILD_TOKEN }}"}]'

- name: Deploy package
run: mvn -B deploy --file pom.xml

- name: Checkout develop branch
uses: actions/[email protected].1
uses: actions/[email protected].3
with:
branch: develop

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:

- uses: actions/[email protected].1
- uses: actions/[email protected].3
with:
fetch-depth: 2

Expand All @@ -20,7 +20,7 @@ jobs:
git checkout develop
- name: Set up JDK 1.8
uses: actions/setup-java@v1
uses: actions/setup-java@v1.4.2
with:
java-version: 1.8

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>io.whelk.hy.phen</groupId>
<artifactId>whelk-hy-phen-a-tion</artifactId>
<version>0.0.20-RELEASE</version>
<version>0.0.21-RELEASE</version>
<name>Hy-phen-a-tion</name>
<description>Java OSS library for calculating syllables and hyphenation using Frank Liang's doctoral thesis.</description>
<url>https://github.com/whelk-io/hy-phen-a-tion</url>
Expand Down Expand Up @@ -51,7 +51,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13</version>
<version>4.13.1</version>
<scope>test</scope>
</dependency>

Expand Down

0 comments on commit d013660

Please sign in to comment.