Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update workflow and tooling versions #910

Merged
merged 7 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:
name: Check Actions
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Changelog check
uses: Zomzog/[email protected]
with:
fileName: CHANGELOG.md
fileName: CHANGELOG.md
noChangelogLabel: skip changelog
checkNotification: Simple
env:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
uses: Swatinem/rust-cache@v2

- name: Setup Aftman
uses: ok-nick/setup-aftman@v0.3.0
uses: ok-nick/setup-aftman@v0.4.2
with:
version: 'v0.2.7'
version: 'v0.3.0'

- name: Build
run: cargo build --locked --verbose
Expand All @@ -56,9 +56,9 @@ jobs:
uses: Swatinem/rust-cache@v2

- name: Setup Aftman
uses: ok-nick/setup-aftman@v0.3.0
uses: ok-nick/setup-aftman@v0.4.2
with:
version: 'v0.2.7'
version: 'v0.3.0'

- name: Build
run: cargo build --locked --verbose
Expand All @@ -81,9 +81,9 @@ jobs:
uses: Swatinem/rust-cache@v2

- name: Setup Aftman
uses: ok-nick/setup-aftman@v0.3.0
uses: ok-nick/setup-aftman@v0.4.2
with:
version: 'v0.2.7'
version: 'v0.3.0'

- name: Stylua
run: stylua --check plugin/src
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,9 @@ jobs:
submodules: true

- name: Setup Aftman
uses: ok-nick/setup-aftman@v0.1.0
uses: ok-nick/setup-aftman@v0.4.2
with:
token: ${{ secrets.GITHUB_TOKEN }}
trust-check: false
version: 'v0.2.6'
version: 'v0.3.0'

- name: Build Plugin
run: rojo build plugin --output Rojo.rbxm
Expand Down Expand Up @@ -89,11 +87,9 @@ jobs:
targets: ${{ matrix.target }}

- name: Setup Aftman
uses: ok-nick/setup-aftman@v0.1.0
uses: ok-nick/setup-aftman@v0.4.2
with:
token: ${{ secrets.GITHUB_TOKEN }}
trust-check: false
version: 'v0.2.6'
version: 'v0.3.0'

- name: Build Release
run: cargo build --release --locked --verbose --target ${{ matrix.target }}
Expand Down
6 changes: 3 additions & 3 deletions aftman.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tools]
rojo = "rojo-rbx/rojo@7.3.0"
selene = "Kampfkarren/selene@0.26.1"
stylua = "JohnnyMorganz/stylua@0.18.2"
rojo = "rojo-rbx/rojo@7.4.1"
selene = "Kampfkarren/selene@0.27.1"
stylua = "JohnnyMorganz/stylua@0.20.0"
run-in-roblox = "rojo-rbx/[email protected]"
2 changes: 1 addition & 1 deletion src/change_processor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ impl JobThreadContext {
// created all at once.
let mut current_path = path.as_path();
let affected_ids = loop {
let ids = tree.get_ids_at_path(&current_path);
let ids = tree.get_ids_at_path(current_path);

log::trace!("Path {} affects IDs {:?}", current_path.display(), ids);

Expand Down
2 changes: 1 addition & 1 deletion src/cli/sourcemap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ impl SourcemapCommand {
let vfs = Vfs::new_default();
vfs.set_watch_enabled(self.watch);

let session = ServeSession::new(vfs, &project_path)?;
let session = ServeSession::new(vfs, project_path)?;
let mut cursor = session.message_queue().cursor();

let filter = if self.include_non_scripts {
Expand Down
Loading