From d2342e1f0594db6497d7eb70ac3e34d380abdd1e Mon Sep 17 00:00:00 2001 From: Kenneth Loeffler Date: Mon, 22 May 2023 01:30:04 -0700 Subject: [PATCH 1/2] Remove Wally --- .github/workflows/ci.yml | 12 +++++------- .github/workflows/release.yml | 10 ++++------ .gitignore | 3 --- .gitmodules | 15 +++++++++++++++ plugin/Packages/Flipper | 1 + plugin/Packages/Promise | 1 + plugin/Packages/Roact | 1 + plugin/Packages/TestEZ | 1 + plugin/Packages/t | 1 + plugin/test-place.project.json | 2 +- plugin/wally.lock | 33 --------------------------------- plugin/wally.toml | 17 ----------------- 12 files changed, 30 insertions(+), 67 deletions(-) create mode 100644 .gitmodules create mode 160000 plugin/Packages/Flipper create mode 160000 plugin/Packages/Promise create mode 160000 plugin/Packages/Roact create mode 160000 plugin/Packages/TestEZ create mode 160000 plugin/Packages/t delete mode 100644 plugin/wally.lock delete mode 100644 plugin/wally.toml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 115b6786d..e71eb1e5e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,6 +20,8 @@ jobs: steps: - uses: actions/checkout@v3 + with: + submodules: true - name: Install Rust uses: actions-rs/toolchain@v1 @@ -33,12 +35,6 @@ jobs: with: version: 'v0.2.7' - - name: Install packages - run: | - cd plugin - wally install - cd .. - - name: Build run: cargo build --locked --verbose @@ -51,6 +47,8 @@ jobs: steps: - uses: actions/checkout@v3 + with: + submodules: true - name: Install Rust uses: actions-rs/toolchain@v1 @@ -74,4 +72,4 @@ jobs: run: cargo fmt -- --check - name: Clippy - run: cargo clippy \ No newline at end of file + run: cargo clippy diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ea4b00512..f4f0aceca 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,6 +28,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + with: + submodules: true - name: Setup Aftman uses: ok-nick/setup-aftman@v0.1.0 @@ -36,12 +38,6 @@ jobs: trust-check: false version: 'v0.2.6' - - name: Install packages - run: | - cd plugin - wally install - cd .. - - name: Build Plugin run: rojo build plugin --output Rojo.rbxm @@ -94,6 +90,8 @@ jobs: BIN: rojo steps: - uses: actions/checkout@v3 + with: + submodules: true - name: Get Version from Tag shell: bash diff --git a/.gitignore b/.gitignore index 2c9101355..88cdf551a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,9 +13,6 @@ # Test places for the Roblox Studio Plugin /plugin/*.rbxlx -# Packages for the Roblox Studio Plugin -/plugin/*Packages - # Roblox Studio holds 'lock' files on places *.rbxl.lock *.rbxlx.lock diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..0842c711d --- /dev/null +++ b/.gitmodules @@ -0,0 +1,15 @@ +[submodule "plugin/Packages/Roact"] + path = plugin/Packages/Roact + url = git@github.com:roblox/roact +[submodule "plugin/Packages/Flipper"] + path = plugin/Packages/Flipper + url = git@github.com:reselim/flipper +[submodule "plugin/Packages/Promise"] + path = plugin/Packages/Promise + url = git@github.com:evaera/roblox-lua-promise +[submodule "plugin/Packages/t"] + path = plugin/Packages/t + url = git@github.com:osyrisrblx/t +[submodule "plugin/Packages/TestEZ"] + path = plugin/Packages/TestEZ + url = git@github.com:roblox/testez diff --git a/plugin/Packages/Flipper b/plugin/Packages/Flipper new file mode 160000 index 000000000..2d91a5ed5 --- /dev/null +++ b/plugin/Packages/Flipper @@ -0,0 +1 @@ +Subproject commit 2d91a5ed55332a3bf50f4eba82f9c812bd2343f8 diff --git a/plugin/Packages/Promise b/plugin/Packages/Promise new file mode 160000 index 000000000..2c6f43390 --- /dev/null +++ b/plugin/Packages/Promise @@ -0,0 +1 @@ +Subproject commit 2c6f433903275e689ba1d48402d4a9d6fdc605a5 diff --git a/plugin/Packages/Roact b/plugin/Packages/Roact new file mode 160000 index 000000000..956891b70 --- /dev/null +++ b/plugin/Packages/Roact @@ -0,0 +1 @@ +Subproject commit 956891b70fdc5410e44e9664719cd0a9f7e6fabd diff --git a/plugin/Packages/TestEZ b/plugin/Packages/TestEZ new file mode 160000 index 000000000..edc7246d0 --- /dev/null +++ b/plugin/Packages/TestEZ @@ -0,0 +1 @@ +Subproject commit edc7246d0173a3a90eba4a9f64ea26c576be5873 diff --git a/plugin/Packages/t b/plugin/Packages/t new file mode 160000 index 000000000..1f9754254 --- /dev/null +++ b/plugin/Packages/t @@ -0,0 +1 @@ +Subproject commit 1f9754254b17bff5a0b7527620083f8ea85f579a diff --git a/plugin/test-place.project.json b/plugin/test-place.project.json index 9ac37f8b7..70875137f 100644 --- a/plugin/test-place.project.json +++ b/plugin/test-place.project.json @@ -9,7 +9,7 @@ }, "Packages": { - "$path": "DevPackages" + "$path": "Packages" } }, diff --git a/plugin/wally.lock b/plugin/wally.lock deleted file mode 100644 index 76e5643cf..000000000 --- a/plugin/wally.lock +++ /dev/null @@ -1,33 +0,0 @@ -# This file is automatically @generated by Wally. -# It is not intended for manual editing. -registry = "test" - -[[package]] -name = "evaera/promise" -version = "4.0.0" -dependencies = [] - -[[package]] -name = "osyrisrblx/t" -version = "3.0.0" -dependencies = [] - -[[package]] -name = "reselim/flipper" -version = "2.0.0" -dependencies = [] - -[[package]] -name = "roblox/roact" -version = "1.4.4" -dependencies = [] - -[[package]] -name = "roblox/testez" -version = "0.4.1" -dependencies = [] - -[[package]] -name = "rojo-rbx/rojo" -version = "7.3.0" -dependencies = [["Flipper", "reselim/flipper@2.0.0"], ["Promise", "evaera/promise@4.0.0"], ["Roact", "roblox/roact@1.4.4"], ["t", "osyrisrblx/t@3.0.0"]] diff --git a/plugin/wally.toml b/plugin/wally.toml deleted file mode 100644 index 0bc177678..000000000 --- a/plugin/wally.toml +++ /dev/null @@ -1,17 +0,0 @@ -[package] -name = "rojo-rbx/rojo" -description = "Rojo enables Roblox developers to use professional-grade software engineering tools" -version = "7.3.0" -license = "MPL-2.0" -authors = ["LPGhatguy (https://lpg.space/)"] -registry = "https://github.com/upliftgames/wally-index" -realm = "shared" - -[dependencies] -Flipper = "reselim/flipper@2.0.0" -Promise = "evaera/promise@4.0.0" -Roact = "roblox/roact@1.4.4" -t = "osyrisrblx/t@3.0.0" - -[dev-dependencies] -TestEZ = "roblox/testez@0.4.1" From 7228ce1f83d71c1ba8425f33198a52aa9589b730 Mon Sep 17 00:00:00 2001 From: Kenneth Loeffler Date: Mon, 22 May 2023 02:00:28 -0700 Subject: [PATCH 2/2] Get the stragglers --- .github/workflows/ci.yml | 6 ------ .github/workflows/release.yml | 7 ------- aftman.toml | 1 - 3 files changed, 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e71eb1e5e..80346f505 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,12 +62,6 @@ jobs: with: version: 'v0.2.7' - - name: Install packages - run: | - cd plugin - wally install - cd .. - - name: Rustfmt run: cargo fmt -- --check diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f4f0aceca..c4833c8d2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -115,13 +115,6 @@ jobs: trust-check: false version: 'v0.2.6' - - name: Install packages - run: | - cd plugin - wally install - cd .. - shell: bash - - name: Build Release run: cargo build --release --locked --verbose env: diff --git a/aftman.toml b/aftman.toml index e96d7deaa..f6e5cfddc 100644 --- a/aftman.toml +++ b/aftman.toml @@ -1,5 +1,4 @@ [tools] -wally = "UpliftGames/wally@0.3.1" rojo = "rojo-rbx/rojo@7.3.0" selene = "Kampfkarren/selene@0.20.0" run-in-roblox = "rojo-rbx/run-in-roblox@0.3.0"