diff --git a/.gitattributes b/.gitattributes index c5d954680..2e976e5f9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,42 +1,3 @@ -# Source code - always LF -*.zig text eol=lf -*.c text eol=lf -*.h text eol=lf -*.cpp text eol=lf -*.m text eol=lf -*.swift text eol=lf -*.py text eol=lf -*.sh text eol=lf - -# Config/build files - always LF -*.zon text eol=lf -*.nix text eol=lf -*.md text eol=lf -*.json text eol=lf -*.yml text eol=lf -*.yaml text eol=lf -*.toml text eol=lf -CMakeLists.txt text eol=lf -*.cmake text eol=lf -Makefile text eol=lf - -# Text data files - always LF (embedded in Zig, parsed with \n split) -*.txt text eol=lf - -# Windows resource files - preserve as-is (native Windows tooling) -*.rc -text -*.manifest -text - -# Binary files -*.png binary -*.ico binary -*.icns binary -*.ttf binary -*.otf binary -*.glsl binary -*.blp binary - -# Linguist overrides build.zig.zon.nix linguist-generated=true build.zig.zon.txt linguist-generated=true build.zig.zon.json linguist-generated=true @@ -51,3 +12,4 @@ src/font/nerd_font_attributes.zig linguist-generated=true src/font/nerd_font_codepoint_tables.py linguist-generated=true src/font/res/** linguist-vendored src/terminal/res/** linguist-vendored +src/terminal/res/rgb.txt -text diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0ff3a84ca..588237368 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -109,7 +109,6 @@ jobs: - test-fuzz-libghostty - test-lib-vt - test-macos - - test-windows - pinact - prettier - swiftlint @@ -1113,27 +1112,6 @@ jobs: - name: test run: nix develop -c zig build test --system ${{ steps.deps.outputs.deps }} - test-windows: - if: github.repository == 'ghostty-org/ghostty' && needs.skip.outputs.skip != 'true' - needs: skip - runs-on: windows-2025 - timeout-minutes: 45 - steps: - - name: Checkout code - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - - - name: Setup Zig - uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2.2.1 - - - name: Test - run: zig build -Dapp-runtime=none test - - - name: Build ghostty.dll - run: zig build -Dapp-runtime=none -Demit-exe=false - - - name: .NET interop tests - run: dotnet test windows/Ghostty.Tests/Ghostty.Tests.csproj - test-i18n: strategy: fail-fast: false diff --git a/src/font/sprite/draw/symbols_for_legacy_computing_supplement.zig b/src/font/sprite/draw/symbols_for_legacy_computing_supplement.zig index 46c7165a8..bd91d3925 100644 --- a/src/font/sprite/draw/symbols_for_legacy_computing_supplement.zig +++ b/src/font/sprite/draw/symbols_for_legacy_computing_supplement.zig @@ -102,14 +102,7 @@ pub fn draw1CD00_1CDE5( const data = @embedFile("octants.txt"); var it = std.mem.splitScalar(u8, data, '\n'); - while (it.next()) |raw_line| { - // Trim \r so this works with both LF and CRLF line endings, - // since git may convert octants.txt to CRLF on Windows checkouts. - const line = if (raw_line.len > 0 and raw_line[raw_line.len - 1] == '\r') - raw_line[0 .. raw_line.len - 1] - else - raw_line; - + while (it.next()) |line| { // Skip comments if (line.len == 0 or line[0] == '#') continue;