Skip to content

Commit

Permalink
revert release workflow, add game clock for latest GHS
Browse files Browse the repository at this point in the history
  • Loading branch information
Lurkars committed Feb 27, 2024
1 parent c5a7d8e commit 578014c
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 19 deletions.
25 changes: 7 additions & 18 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: ncipollo/release-action@v1
with:
draft: true
generateReleaseNotes: true
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
Expand All @@ -28,18 +24,11 @@ jobs:
run: mvn --batch-mode --update-snapshots package -P db-postgresql
- name: Build with mariadb Maven
run: mvn --batch-mode --update-snapshots package -P db-mariadb
- name: add files to release
uses: ncipollo/release-action@v1
with:
allowUpdates: true
draft: true
generateReleaseNotes: true
updateOnlyUnreleased: true
artifacts: "./target/ghs-server-${{github.ref_name}}.jar,./target/ghs-server-${{github.ref_name}}-postgresql.jar,./target/ghs-server-${{github.ref_name}}-mariadb.jar"
- name: publish release
uses: ncipollo/release-action@v1
- name: Release
uses: softprops/action-gh-release@v1
with:
allowUpdates: true
draft: false
generateReleaseNotes: true
updateOnlyUnreleased: true
generate_release_notes: true
files: |
./target/ghs-server-${{github.ref_name}}.jar
./target/ghs-server-${{github.ref_name}}-postgresql.jar
./target/ghs-server-${{github.ref_name}}-mariadb.jar
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>17</java.version>
<revision>0.89.5</revision>
<revision>0.90.0</revision>
</properties>

<parent>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package de.champonthis.ghs.server.model;

import de.champonthis.ghs.server.util.Required;

public class GameClockTimestamp {

@Required
private Long clockIn;
private Long clockOut;

/**
* Gets the clock in.
*
* @return the clock in
*/
public Long getClockIn() {
return clockIn;
}

/**
* Sets the clock in.
*
* @param clockIn the new clock in
*/
public void setClockIn(Long clockIn) {
this.clockIn = clockIn;
}

/**
* Gets the clock out.
*
* @return the clock out
*/
public Long getClockOut() {
return clockOut;
}

/**
* Sets the clock out.
*
* @param clockOut the new clock out
*/
public void setClockOut(Long clockOut) {
this.clockOut = clockOut;
}
}
20 changes: 20 additions & 0 deletions src/main/java/de/champonthis/ghs/server/model/GameModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ public class GameModel {
@Required
private boolean server = false;
private ScenarioFinish finish;
@Required
private LinkedList<GameClockTimestamp> gameClock = new LinkedList<>();

/**
* Gets the revision.
Expand Down Expand Up @@ -828,4 +830,22 @@ public void setFinish(ScenarioFinish finish) {
this.finish = finish;
}

/**
* Gets the game clock.
*
* @return the game clock
*/
public LinkedList<GameClockTimestamp> getGameClock() {
return gameClock;
}

/**
* Sets the game clock.
*
* @param gameClock the new game clock
*/
public void setGameClock(LinkedList<GameClockTimestamp> gameClock) {
this.gameClock = gameClock;
}

}

0 comments on commit 578014c

Please sign in to comment.