Merge pull request #346 from xpdota/fixes

Fixed timeline export, fixed release builder line endings for Linux
xpdota · Mar 13, 2023 · e21f173 · e21f173
2 parents c426b87 + 2c3867b
commit e21f173
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/post_new_release.yml b/.github/workflows/post_new_release.yml
@@ -25,6 +25,10 @@ jobs:
     permissions:
       contents: write
     steps:
+      - name: Set git to use LF instead of CRLF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
       - uses: actions/checkout@v2
         with:
           ref: stable
@@ -36,7 +40,7 @@ jobs:
       - name: Build with Maven
         #run: JAVA_HOME=$JAVA_HOME_17_X64 mvn -T3 clean install
         # TODO: make sure this runs with the correct java
-        run: mvn -T1 clean install -Dsurefire.threadcount=1
+        run: mvn -T1 clean install '-Dsurefire.threadcount=1'
 
       - name: Copy artifacts
         run: mv launcher/target/*.zip ./

diff --git a/timelines/src/main/java/gg/xp/xivsupport/timelines/TimelineEntry.java b/timelines/src/main/java/gg/xp/xivsupport/timelines/TimelineEntry.java
@@ -121,6 +121,10 @@ default TimelineEntry untranslated() {
 	@JsonIgnore
 	default String toTextFormat() {
 		StringBuilder sb = new StringBuilder();
+		if (!enabled()) {
+			// If disabled, just comment out the line
+			sb.append("# ");
+		}
 		sb.append(fmtDouble(time())).append(' ');
 		String name = name();
 		if (name == null || name.isEmpty()) {
@@ -150,7 +154,7 @@ default String toTextFormat() {
 
 	@JsonIgnore
 	default Stream<String> makeTriggerTimelineEntries() {
-		if (!callout()) {
+		if (!enabled() || !callout()) {
 			return Stream.empty();
 		}
 		String uniqueName = makeUniqueName();