From c9ce996626857983e2f42e9986c99192dbee4b81 Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 3 Sep 2024 15:36:36 -0700 Subject: [PATCH] Update workflow and tooling versions (#910) --- .github/workflows/changelog.yml | 6 +++--- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/release.yml | 12 ++++-------- aftman.toml | 6 +++--- src/change_processor.rs | 2 +- src/cli/sourcemap.rs | 2 +- 6 files changed, 18 insertions(+), 22 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 699152cce..307b4f26b 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -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/changelog-checker@v1.3.0 with: - fileName: CHANGELOG.md + fileName: CHANGELOG.md noChangelogLabel: skip changelog checkNotification: Simple env: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b7dbd5eea..8f7b8a027 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8219cd1cc..a1718858a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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 }} diff --git a/aftman.toml b/aftman.toml index 5273b6d07..8de6c658a 100644 --- a/aftman.toml +++ b/aftman.toml @@ -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/run-in-roblox@0.3.0" diff --git a/src/change_processor.rs b/src/change_processor.rs index 497ba4e79..c5978b8c5 100644 --- a/src/change_processor.rs +++ b/src/change_processor.rs @@ -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(¤t_path); + let ids = tree.get_ids_at_path(current_path); log::trace!("Path {} affects IDs {:?}", current_path.display(), ids); diff --git a/src/cli/sourcemap.rs b/src/cli/sourcemap.rs index ec4e95280..cbb801c5e 100644 --- a/src/cli/sourcemap.rs +++ b/src/cli/sourcemap.rs @@ -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 {