Fixed timeline export, fixed release builder line endings for Linux

xpdota · Mar 13, 2023 · c6ebe0d · c6ebe0d
1 parent c426b87
commit c6ebe0d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
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

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();