From 79c02f2457c0927a08c93584abb29c5fdefeee77 Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Thu, 26 May 2022 04:13:50 -0400 Subject: [PATCH] Delete old bin folder and update foreman.toml --- bin/dev-plugin.sh | 5 ----- bin/install-dev-plugin.sh | 13 ------------- bin/install-release-plugin.sh | 5 ----- bin/mark-plugin-as-dev.lua | 12 ------------ bin/put-plugin-in-test-place.lua | 8 -------- bin/run-all-tests.sh | 6 ------ bin/run-cli-tests.sh | 9 --------- bin/run-plugin-tests.sh | 16 ---------------- foreman.toml | 3 ++- 9 files changed, 2 insertions(+), 75 deletions(-) delete mode 100755 bin/dev-plugin.sh delete mode 100755 bin/install-dev-plugin.sh delete mode 100755 bin/install-release-plugin.sh delete mode 100644 bin/mark-plugin-as-dev.lua delete mode 100644 bin/put-plugin-in-test-place.lua delete mode 100755 bin/run-all-tests.sh delete mode 100755 bin/run-cli-tests.sh delete mode 100755 bin/run-plugin-tests.sh diff --git a/bin/dev-plugin.sh b/bin/dev-plugin.sh deleted file mode 100755 index 0b786218..00000000 --- a/bin/dev-plugin.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -set -e - -watchexec -c -w plugin "sh -c './bin/install-dev-plugin.sh'" \ No newline at end of file diff --git a/bin/install-dev-plugin.sh b/bin/install-dev-plugin.sh deleted file mode 100755 index d8a8376c..00000000 --- a/bin/install-dev-plugin.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -set -e - -DIR="$( mktemp -d )" -PLUGIN_FILE="$DIR/Rojo.rbxm" -TESTEZ_FILE="$DIR/TestEZ.rbxm" - -rojo build plugin -o "$PLUGIN_FILE" -rojo build plugin/testez.project.json -o "$TESTEZ_FILE" -remodel bin/mark-plugin-as-dev.lua "$PLUGIN_FILE" "$TESTEZ_FILE" 2>/dev/null - -cp "$PLUGIN_FILE" "$LOCALAPPDATA/Roblox/Plugins/Rojo.rbxm" \ No newline at end of file diff --git a/bin/install-release-plugin.sh b/bin/install-release-plugin.sh deleted file mode 100755 index f670c18c..00000000 --- a/bin/install-release-plugin.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -set -e - -rojo build plugin -o "$LOCALAPPDATA/Roblox/Plugins/Rojo.rbxm" \ No newline at end of file diff --git a/bin/mark-plugin-as-dev.lua b/bin/mark-plugin-as-dev.lua deleted file mode 100644 index 49fe902a..00000000 --- a/bin/mark-plugin-as-dev.lua +++ /dev/null @@ -1,12 +0,0 @@ -local pluginPath, testezPath = ... - -local plugin = remodel.readModelFile(pluginPath)[1] -local testez = remodel.readModelFile(testezPath)[1] - -local marker = Instance.new("Folder") -marker.Name = "ROJO_DEV_BUILD" -marker.Parent = plugin - -testez.Parent = plugin - -remodel.writeModelFile(plugin, pluginPath) \ No newline at end of file diff --git a/bin/put-plugin-in-test-place.lua b/bin/put-plugin-in-test-place.lua deleted file mode 100644 index f651c1bf..00000000 --- a/bin/put-plugin-in-test-place.lua +++ /dev/null @@ -1,8 +0,0 @@ -local pluginPath, placePath = ... - -local plugin = remodel.readModelFile(pluginPath)[1] -local place = remodel.readPlaceFile(placePath) - -plugin.Parent = place:GetService("ReplicatedStorage") - -remodel.writePlaceFile(place, placePath) \ No newline at end of file diff --git a/bin/run-all-tests.sh b/bin/run-all-tests.sh deleted file mode 100755 index e17aafa4..00000000 --- a/bin/run-all-tests.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -set -e - -./bin/run-cli-tests.sh -./bin/run-plugin-tests.sh \ No newline at end of file diff --git a/bin/run-cli-tests.sh b/bin/run-cli-tests.sh deleted file mode 100755 index 8f1b49a2..00000000 --- a/bin/run-cli-tests.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -set -e - -cargo test --all --locked -cargo fmt -- --check - -touch src/lib.rs # Nudge Rust source to make Clippy actually check things -cargo clippy \ No newline at end of file diff --git a/bin/run-plugin-tests.sh b/bin/run-plugin-tests.sh deleted file mode 100755 index 1da9bb47..00000000 --- a/bin/run-plugin-tests.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -set -e - -DIR="$( mktemp -d )" -PLUGIN_FILE="$DIR/Rojo.rbxmx" -PLACE_FILE="$DIR/RojoTestPlace.rbxlx" - -rojo build plugin -o "$PLUGIN_FILE" -rojo build plugin/place.project.json -o "$PLACE_FILE" - -remodel bin/put-plugin-in-test-place.lua "$PLUGIN_FILE" "$PLACE_FILE" - -run-in-roblox -s plugin/testBootstrap.server.lua "$PLACE_FILE" - -luacheck plugin/src plugin/log plugin/http \ No newline at end of file diff --git a/foreman.toml b/foreman.toml index d6e1b51f..c1275b8d 100644 --- a/foreman.toml +++ b/foreman.toml @@ -1,3 +1,4 @@ [tools] -rojo = { source = "rojo-rbx/rojo", version = "6.1.0" } +rojo = { source = "rojo-rbx/rojo", version = "7.1.1" } run-in-roblox = { source = "rojo-rbx/run-in-roblox", version = "0.3.0" } +selene = { source = "Kampfkarren/selene", version = "0.17.0" }