Switch plugin packages back to git submodules (#678)

Alright, so I hate to be the one to do this, but #584 broke crates.io
publishing and also caused librojo to be unusable. I see that there was
some discussion on Discord shortly after the problem was realized, but
there was no action taken.

I think keeping librojo and publishing working far, far outweigh any
convenience added by Wally.

I've kept the same `Packages` naming convention to keep the diff
minimal.
This commit is contained in:
Kenneth Loeffler
2023-05-26 10:26:21 -07:00
committed by GitHub
parent 305423b856
commit d87c76a23e
13 changed files with 30 additions and 81 deletions

View File

@@ -20,6 +20,8 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with:
submodules: true
- name: Install Rust - name: Install Rust
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
@@ -33,12 +35,6 @@ jobs:
with: with:
version: 'v0.2.7' version: 'v0.2.7'
- name: Install packages
run: |
cd plugin
wally install
cd ..
- name: Build - name: Build
run: cargo build --locked --verbose run: cargo build --locked --verbose
@@ -51,6 +47,8 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with:
submodules: true
- name: Install Rust - name: Install Rust
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
@@ -64,14 +62,8 @@ jobs:
with: with:
version: 'v0.2.7' version: 'v0.2.7'
- name: Install packages
run: |
cd plugin
wally install
cd ..
- name: Rustfmt - name: Rustfmt
run: cargo fmt -- --check run: cargo fmt -- --check
- name: Clippy - name: Clippy
run: cargo clippy run: cargo clippy

View File

@@ -28,6 +28,8 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with:
submodules: true
- name: Setup Aftman - name: Setup Aftman
uses: ok-nick/setup-aftman@v0.1.0 uses: ok-nick/setup-aftman@v0.1.0
@@ -36,12 +38,6 @@ jobs:
trust-check: false trust-check: false
version: 'v0.2.6' version: 'v0.2.6'
- name: Install packages
run: |
cd plugin
wally install
cd ..
- name: Build Plugin - name: Build Plugin
run: rojo build plugin --output Rojo.rbxm run: rojo build plugin --output Rojo.rbxm
@@ -94,6 +90,8 @@ jobs:
BIN: rojo BIN: rojo
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with:
submodules: true
- name: Get Version from Tag - name: Get Version from Tag
shell: bash shell: bash
@@ -117,13 +115,6 @@ jobs:
trust-check: false trust-check: false
version: 'v0.2.6' version: 'v0.2.6'
- name: Install packages
run: |
cd plugin
wally install
cd ..
shell: bash
- name: Build Release - name: Build Release
run: cargo build --release --locked --verbose run: cargo build --release --locked --verbose
env: env:

3
.gitignore vendored
View File

@@ -13,9 +13,6 @@
# Test places for the Roblox Studio Plugin # Test places for the Roblox Studio Plugin
/plugin/*.rbxlx /plugin/*.rbxlx
# Packages for the Roblox Studio Plugin
/plugin/*Packages
# Roblox Studio holds 'lock' files on places # Roblox Studio holds 'lock' files on places
*.rbxl.lock *.rbxl.lock
*.rbxlx.lock *.rbxlx.lock

15
.gitmodules vendored Normal file
View File

@@ -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

View File

@@ -1,5 +1,4 @@
[tools] [tools]
wally = "UpliftGames/wally@0.3.1"
rojo = "rojo-rbx/rojo@7.3.0" rojo = "rojo-rbx/rojo@7.3.0"
selene = "Kampfkarren/selene@0.20.0" selene = "Kampfkarren/selene@0.20.0"
run-in-roblox = "rojo-rbx/run-in-roblox@0.3.0" run-in-roblox = "rojo-rbx/run-in-roblox@0.3.0"

1
plugin/Packages/Roact Submodule

Submodule plugin/Packages/Roact added at 956891b70f

1
plugin/Packages/t Submodule

Submodule plugin/Packages/t added at 1f9754254b

View File

@@ -9,7 +9,7 @@
}, },
"Packages": { "Packages": {
"$path": "DevPackages" "$path": "Packages"
} }
}, },

View File

@@ -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"]]

View File

@@ -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"