Merge pull request #12272 from smowton/smowton/admin/rc38-ci-fixes

Merge rc/3.7 into rc/3.8

Author: smowton

java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/.gitattributes

@@ -0,0 +1,6 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
+

java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,6 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
+import platform
 from create_database_utils import *
 
+gradle_cmd = "gradlew.bat" if platform.system() == "Windows" else "./gradlew"
+
 run_codeql_database_create(
-    ["gradle build --no-daemon --no-build-cache"], lang="java")
-runSuccessfully([get_cmd("gradle"), "clean"])
+    ["%s build --no-daemon --no-build-cache" % gradle_cmd], lang="java")

java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/gradlew

@@ -0,0 +1,6 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
+

java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/gradlew.bat

@@ -0,0 +1,6 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists