Skip to content

Commit

Permalink
Switch plugin packages back to git submodules (#678)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
kennethloeffler authored May 26, 2023
1 parent 305423b commit d87c76a
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 81 deletions.
18 changes: 5 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
submodules: true

- name: Install Rust
uses: actions-rs/toolchain@v1
Expand All @@ -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

Expand All @@ -51,6 +47,8 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
submodules: true

- name: Install Rust
uses: actions-rs/toolchain@v1
Expand All @@ -64,14 +62,8 @@ jobs:
with:
version: 'v0.2.7'

- name: Install packages
run: |
cd plugin
wally install
cd ..
- name: Rustfmt
run: cargo fmt -- --check

- name: Clippy
run: cargo clippy
run: cargo clippy
17 changes: 4 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: true

- name: Setup Aftman
uses: ok-nick/[email protected]
Expand All @@ -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

Expand Down Expand Up @@ -94,6 +90,8 @@ jobs:
BIN: rojo
steps:
- uses: actions/checkout@v3
with:
submodules: true

- name: Get Version from Tag
shell: bash
Expand All @@ -117,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:
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 15 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[submodule "plugin/Packages/Roact"]
path = plugin/Packages/Roact
url = [email protected]:roblox/roact
[submodule "plugin/Packages/Flipper"]
path = plugin/Packages/Flipper
url = [email protected]:reselim/flipper
[submodule "plugin/Packages/Promise"]
path = plugin/Packages/Promise
url = [email protected]:evaera/roblox-lua-promise
[submodule "plugin/Packages/t"]
path = plugin/Packages/t
url = [email protected]:osyrisrblx/t
[submodule "plugin/Packages/TestEZ"]
path = plugin/Packages/TestEZ
url = [email protected]:roblox/testez
1 change: 0 additions & 1 deletion aftman.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[tools]
wally = "UpliftGames/[email protected]"
rojo = "rojo-rbx/[email protected]"
selene = "Kampfkarren/[email protected]"
run-in-roblox = "rojo-rbx/[email protected]"
1 change: 1 addition & 0 deletions plugin/Packages/Flipper
Submodule Flipper added at 2d91a5
1 change: 1 addition & 0 deletions plugin/Packages/Promise
Submodule Promise added at 2c6f43
1 change: 1 addition & 0 deletions plugin/Packages/Roact
Submodule Roact added at 956891
1 change: 1 addition & 0 deletions plugin/Packages/TestEZ
Submodule TestEZ added at edc724
1 change: 1 addition & 0 deletions plugin/Packages/t
Submodule t added at 1f9754
2 changes: 1 addition & 1 deletion plugin/test-place.project.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},

"Packages": {
"$path": "DevPackages"
"$path": "Packages"
}
},

Expand Down
33 changes: 0 additions & 33 deletions plugin/wally.lock

This file was deleted.

17 changes: 0 additions & 17 deletions plugin/wally.toml

This file was deleted.

0 comments on commit d87c76a

Please sign in to comment.