Skip to content

Commit

Permalink
Always use unix line endings on windows (#986)
Browse files Browse the repository at this point in the history
* Always use unix line endings on windows

* Also run checks on windows.

* Fix binary files :)
  • Loading branch information
modmuss50 authored Nov 23, 2023
1 parent 92da5ad commit b987b4e
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 47 deletions.
40 changes: 2 additions & 38 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,38 +1,2 @@
# Handle line endings automatically for files detected as text
# and leave all files detected as binary untouched.
* text=auto

*.patch text eol=lf

#
# The above will handle all files NOT found below
#
# These files are text and should be normalized (Convert crlf => lf)
*.css text
*.df text
*.htm text
*.html text
*.java text
*.js text
*.json text
*.jsp text
*.jspf text
*.properties text
*.sh text
*.tld text
*.txt text
*.xml text

# These files are binary and should be left untouched
# (binary is a macro for -text -diff)
*.class binary
*.dll binary
*.ear binary
*.gif binary
*.ico binary
*.jar binary
*.jpg binary
*.jpeg binary
*.png binary
*.so binary
*.war binary
* text=auto eol=lf
*.bat text eol=crlf
12 changes: 12 additions & 0 deletions .github/workflows/test-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,18 @@ jobs:
- uses: gradle/wrapper-validation-action@v1
- run: gradle build check -x test --stacktrace --warning-mode fail

build_windows:
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
- name: setup jdk
uses: actions/setup-java@v3
with:
java-version: 17
distribution: 'temurin'
- uses: gradle/wrapper-validation-action@v1
- run: ./gradlew build check -x test --stacktrace --warning-mode fail

# This job is used to feed the test matrix of next job to allow the tests to run in parallel
prepare_test_matrix:
# Lets wait to ensure it builds before going running tests
Expand Down
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,8 @@ java {
}

spotless {
lineEndings = com.diffplug.spotless.LineEnding.UNIX

java {
licenseHeaderFile(rootProject.file("HEADER")).yearSeparator("-")
targetExclude("**/loom/util/DownloadUtil.java")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,12 @@ class ReproducibleBuildTest extends Specification implements GradleProjectTestTr
then:
result.task(":build").outcome == SUCCESS
generateMD5(gradle.getOutputFile("fabric-example-mod-1.0.0.jar")) == modHash
generateMD5(gradle.getOutputFile("fabric-example-mod-1.0.0-sources.jar")) in sourceHash // Done for different line endings.
generateMD5(gradle.getOutputFile("fabric-example-mod-1.0.0-sources.jar")) == sourceHash

where:
version | modHash | sourceHash
DEFAULT_GRADLE | "207bd75aa34fc996a97e962dd98b61d5" | [
"8e8fac2a5e32fc872e6cf0f9ccc55cfd",
"ed331b6fae5677797a0104eba014e255"
]
PRE_RELEASE_GRADLE | "207bd75aa34fc996a97e962dd98b61d5" | [
"8e8fac2a5e32fc872e6cf0f9ccc55cfd",
"ed331b6fae5677797a0104eba014e255"
]
DEFAULT_GRADLE | "207bd75aa34fc996a97e962dd98b61d5" | "8e8fac2a5e32fc872e6cf0f9ccc55cfd"
PRE_RELEASE_GRADLE | "207bd75aa34fc996a97e962dd98b61d5" | "8e8fac2a5e32fc872e6cf0f9ccc55cfd"
}

String generateMD5(File file) {
Expand Down

0 comments on commit b987b4e

Please sign in to comment.