Compare commits
14 Commits
5577ddc74b
...
ae5ad2a8fa
Author | SHA1 | Date |
---|---|---|
TKB Studios | ae5ad2a8fa | |
Jonathan Coates | 929debd382 | |
Jonathan Coates | 4980b7355d | |
Jonathan Coates | 925092add3 | |
TKB Studios | 4a26ceeaf7 | |
TKB Studios | 6de639c601 | |
TKB Studios | 48d59538ff | |
TKB Studios | 54dd9c6f38 | |
TKB Studios | 165e118bc6 | |
TKB Studios | ab7ffa846f | |
TKB Studios | de5ef3f2ea | |
TKB Studios | 34b0c6737e | |
TKB Studios | 6e3966fe24 | |
TKB Studios | 0b8ede22a7 |
|
@ -58,13 +58,13 @@ jobs:
|
|||
find projects/forge/build/libs projects/fabric/build/libs -type f -regex '.*[0-9.]+\(-SNAPSHOT\)?\.jar$' -exec bash -c 'cp {} "jars/$(basename {} .jar)-$(git rev-parse HEAD).jar"' \;
|
||||
|
||||
- name: 📤 Upload Jar
|
||||
uses: actions/upload-artifact@v3
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: CC-Tweaked
|
||||
path: ./jars
|
||||
|
||||
- name: 📤 Upload coverage
|
||||
uses: codecov/codecov-action@v3
|
||||
uses: codecov/codecov-action@v4
|
||||
|
||||
build-core:
|
||||
strategy:
|
||||
|
@ -81,24 +81,28 @@ jobs:
|
|||
runs-on: ${{ matrix.uses }}
|
||||
|
||||
steps:
|
||||
- name: Clone repository
|
||||
- name: 📥 Clone repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Set up Java
|
||||
- name: 📥 Set up Java
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
java-version: 17
|
||||
distribution: 'temurin'
|
||||
|
||||
- name: Setup Gradle
|
||||
- name: 📥 Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v3
|
||||
with:
|
||||
cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/mc-') }}
|
||||
|
||||
- name: Run tests
|
||||
- name: ⚒️ Build
|
||||
run: |
|
||||
./gradlew --configure-on-demand :core:assemble
|
||||
|
||||
- name: 🧪 Run tests
|
||||
run: |
|
||||
./gradlew --configure-on-demand :core:test
|
||||
|
||||
- name: Parse test reports
|
||||
- name: 🧪 Parse test reports
|
||||
run: python3 ./tools/parse-reports.py
|
||||
if: ${{ failure() }}
|
||||
|
|
|
@ -29,9 +29,9 @@ ## Setting up a development environment
|
|||
In order to develop CC: Tweaked, you'll need to download the source code and then run it.
|
||||
|
||||
- Make sure you've got the following software installed:
|
||||
- Java Development Kit (JDK) installed. This can be downloaded from [Adoptium].
|
||||
- Java Development Kit (JDK). This can be downloaded from [Adoptium].
|
||||
- [Git](https://git-scm.com/).
|
||||
- If you want to work on documentation, [NodeJS][node].
|
||||
- [NodeJS][node].
|
||||
|
||||
- Download CC: Tweaked's source code:
|
||||
```
|
||||
|
|
|
@ -46,7 +46,7 @@ abstract class NpmInstall : DefaultTask() {
|
|||
@TaskAction
|
||||
fun install() {
|
||||
project.exec {
|
||||
commandLine("npm", "ci")
|
||||
commandLine(ProcessHelpers.getExecutable("npm"), "ci")
|
||||
workingDir = projectRoot.get().asFile
|
||||
}
|
||||
}
|
||||
|
@ -59,6 +59,6 @@ fun install() {
|
|||
abstract class NpxExecToDir : ExecToDir() {
|
||||
init {
|
||||
dependsOn(NpmInstall.TASK_NAME)
|
||||
executable = "npx"
|
||||
executable = ProcessHelpers.getExecutable("npx")
|
||||
}
|
||||
}
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
import java.io.BufferedReader
|
||||
import java.io.File
|
||||
import java.io.InputStreamReader
|
||||
import java.nio.charset.StandardCharsets
|
||||
|
||||
internal object ProcessHelpers {
|
||||
fun startProcess(vararg command: String): Process {
|
||||
|
@ -34,7 +35,7 @@ fun captureLines(vararg command: String): List<String> {
|
|||
val process = startProcess(*command)
|
||||
process.outputStream.close()
|
||||
|
||||
val out = BufferedReader(InputStreamReader(process.inputStream)).use { reader ->
|
||||
val out = BufferedReader(InputStreamReader(process.inputStream, StandardCharsets.UTF_8)).use { reader ->
|
||||
reader.lines().filter { it.isNotEmpty() }.toList()
|
||||
}
|
||||
ProcessGroovyMethods.closeStreams(process)
|
||||
|
@ -46,6 +47,28 @@ fun onPath(name: String): Boolean {
|
|||
val path = System.getenv("PATH") ?: return false
|
||||
return path.splitToSequence(File.pathSeparator).any { File(it, name).exists() }
|
||||
}
|
||||
|
||||
/**
|
||||
* Search for an executable on the `PATH` if required.
|
||||
*
|
||||
* [Process]/[ProcessBuilder] does not handle all executable file extensions on Windows (such as `.com). When on
|
||||
* Windows, this function searches `PATH` and `PATHEXT` for an executable matching [name].
|
||||
*/
|
||||
fun getExecutable(name: String): String {
|
||||
if (!System.getProperty("os.name").lowercase().contains("windows")) return name
|
||||
|
||||
val path = (System.getenv("PATH") ?: return name).split(File.pathSeparator)
|
||||
val pathExt = (System.getenv("PATHEXT") ?: return name).split(File.pathSeparator)
|
||||
|
||||
for (pathEntry in path) {
|
||||
for (ext in pathExt) {
|
||||
val resolved = File(pathEntry, name + ext)
|
||||
if (resolved.exists()) return resolved.getAbsolutePath()
|
||||
}
|
||||
}
|
||||
|
||||
return name
|
||||
}
|
||||
}
|
||||
|
||||
internal fun Process.waitForOrThrow(message: String) {
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#
|
||||
# SPDX-License-Identifier: MPL-2.0
|
||||
|
||||
org.gradle.jvmargs=-Xmx3G
|
||||
org.gradle.jvmargs=-Xmx3G -Dfile.encoding=UTF-8
|
||||
org.gradle.parallel=true
|
||||
|
||||
kotlin.stdlib.default.dependency=false
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
* @see dan200.computercraft.core.apis.HTTPAPI#websocket On how to open a websocket.
|
||||
*/
|
||||
public class WebsocketHandle {
|
||||
private static final CharsetDecoder DECODER = StandardCharsets.UTF_8.newDecoder().onMalformedInput(CodingErrorAction.REPLACE);
|
||||
private static final ThreadLocal<CharsetDecoder> DECODER = ThreadLocal.withInitial(() -> StandardCharsets.UTF_8.newDecoder().onMalformedInput(CodingErrorAction.REPLACE));
|
||||
|
||||
private final IAPIEnvironment environment;
|
||||
private final String address;
|
||||
|
@ -87,7 +87,7 @@ public final void send(Coerced<ByteBuffer> message, Optional<Boolean> binary) th
|
|||
websocket.sendBinary(text);
|
||||
} else {
|
||||
try {
|
||||
websocket.sendText(DECODER.decode(text).toString());
|
||||
websocket.sendText(DECODER.get().decode(text).toString());
|
||||
} catch (CharacterCodingException e) {
|
||||
// This shouldn't happen, but worth mentioning.
|
||||
throw new LuaException("Message is not valid UTF8");
|
||||
|
|
|
@ -213,16 +213,16 @@ end
|
|||
-- Existing settings will be merged with any pre-existing ones. Conflicting
|
||||
-- entries will be overwritten, but any others will be preserved.
|
||||
--
|
||||
-- @tparam[opt] string sPath The file to load from, defaulting to `.settings`.
|
||||
-- @tparam[opt=".settings"] string path The file to load from.
|
||||
-- @treturn boolean Whether settings were successfully read from this
|
||||
-- file. Reasons for failure may include the file not existing or being
|
||||
-- corrupted.
|
||||
--
|
||||
-- @see settings.save
|
||||
-- @changed 1.87.0 `sPath` is now optional.
|
||||
function load(sPath)
|
||||
expect(1, sPath, "string", "nil")
|
||||
local file = fs.open(sPath or ".settings", "r")
|
||||
-- @changed 1.87.0 `path` is now optional.
|
||||
function load(path)
|
||||
expect(1, path, "string", "nil")
|
||||
local file = fs.open(path or ".settings", "r")
|
||||
if not file then
|
||||
return false
|
||||
end
|
||||
|
@ -255,14 +255,14 @@ end
|
|||
-- This will entirely overwrite the pre-existing file. Settings defined in the
|
||||
-- file, but not currently loaded will be removed.
|
||||
--
|
||||
-- @tparam[opt] string sPath The path to save settings to, defaulting to `.settings`.
|
||||
-- @tparam[opt=".settings"] string path The path to save settings to.
|
||||
-- @treturn boolean If the settings were successfully saved.
|
||||
--
|
||||
-- @see settings.load
|
||||
-- @changed 1.87.0 `sPath` is now optional.
|
||||
function save(sPath)
|
||||
expect(1, sPath, "string", "nil")
|
||||
local file = fs.open(sPath or ".settings", "w")
|
||||
-- @changed 1.87.0 `path` is now optional.
|
||||
function save(path)
|
||||
expect(1, path, "string", "nil")
|
||||
local file = fs.open(path or ".settings", "w")
|
||||
if not file then
|
||||
return false
|
||||
end
|
||||
|
|
|
@ -109,7 +109,39 @@ local function ensure_width(line, width)
|
|||
return line
|
||||
end
|
||||
|
||||
--- Splits a string in a table.
|
||||
--
|
||||
-- @tparam string inputstr The string to split.
|
||||
-- @tparam string sep The separator to split the string at
|
||||
-- @tparam number split_count How many times the string should be splitted.
|
||||
-- @treturn table A table containing the splitted strings.
|
||||
-- @usage args = textutils.splitString("arg1 arg2", " ")
|
||||
-- @since edit this if it goes live (I hope it does)
|
||||
local function split(inputstr, sep, split_count)
|
||||
expect(1, inputstr, "string")
|
||||
expect(2, sep, "string", "nil")
|
||||
expect(3, split_count, "number", "nil")
|
||||
if sep == nil then
|
||||
sep = "%s"
|
||||
end
|
||||
if split_count == nil then
|
||||
split_count = -1
|
||||
end
|
||||
local splitted_table = {}
|
||||
local splitted_amount = 0
|
||||
for str in string.gmatch(inputstr, "([^" .. sep .. "]+)") do
|
||||
if splitted_amount == split_count then
|
||||
break
|
||||
else
|
||||
table.insert(splitted_table, str)
|
||||
splitted_amount = splitted_amount + 1
|
||||
end
|
||||
end
|
||||
return splitted_table
|
||||
end
|
||||
|
||||
return {
|
||||
wrap = wrap,
|
||||
ensure_width = ensure_width,
|
||||
split = split,
|
||||
}
|
||||
|
|
|
@ -68,6 +68,10 @@ public void remapClass(String from, String to) {
|
|||
}
|
||||
|
||||
private @Nullable Path findUnmappedFile(String name) {
|
||||
// For some odd reason, we try to resolve the generated lambda classes. This includes classes called
|
||||
// things like <linit>lambda, which is an invalid path on Windows. Detect those, and abort early.
|
||||
if (name.indexOf("<") >= 0) return null;
|
||||
|
||||
return classpath.stream().map(x -> x.resolve(name)).filter(Files::exists).findFirst().orElse(null);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue