From f734e31849d7c004ea09743809e25420967d02eb Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 7 May 2024 13:36:01 -0700 Subject: [PATCH 1/7] Update version of setup-aftman action --- .github/workflows/ci.yml | 6 +++--- .github/workflows/release.yml | 8 ++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b7dbd5eea..cf5ecea85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ 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' @@ -56,7 +56,7 @@ 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' @@ -81,7 +81,7 @@ 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' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8219cd1cc..ca89fc877 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,10 +26,8 @@ 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' - name: Build Plugin @@ -89,10 +87,8 @@ 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' - name: Build Release From 9c6dbb7927a41626dca60bf1bb739106ff6faf94 Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 7 May 2024 13:37:10 -0700 Subject: [PATCH 2/7] Update version of Aftman used in CI --- .github/workflows/ci.yml | 6 +++--- .github/workflows/release.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf5ecea85..59c4f7233 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: - name: Setup Aftman uses: ok-nick/setup-aftman@v0.4.2 with: - version: 'v0.2.7' + version: 'v0.2.8' - name: Build run: cargo build --locked --verbose @@ -58,7 +58,7 @@ jobs: - name: Setup Aftman uses: ok-nick/setup-aftman@v0.4.2 with: - version: 'v0.2.7' + version: 'v0.2.8' - name: Build run: cargo build --locked --verbose @@ -83,7 +83,7 @@ jobs: - name: Setup Aftman uses: ok-nick/setup-aftman@v0.4.2 with: - version: 'v0.2.7' + version: 'v0.2.8' - name: Stylua run: stylua --check plugin/src diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ca89fc877..0bd4dc83d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: - name: Setup Aftman uses: ok-nick/setup-aftman@v0.4.2 with: - version: 'v0.2.6' + version: 'v0.2.8' - name: Build Plugin run: rojo build plugin --output Rojo.rbxm @@ -89,7 +89,7 @@ jobs: - name: Setup Aftman uses: ok-nick/setup-aftman@v0.4.2 with: - version: 'v0.2.6' + version: 'v0.2.8' - name: Build Release run: cargo build --release --locked --verbose --target ${{ matrix.target }} From 66ddea1d539c5c5b825479905a473f9f74f78d64 Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 7 May 2024 13:37:32 -0700 Subject: [PATCH 3/7] Update version of tools in aftman.toml --- aftman.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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" From 10b10b064f1f242df818d9721a47361b00c5b882 Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 7 May 2024 13:40:40 -0700 Subject: [PATCH 4/7] Remove superfluous borrows --- src/change_processor.rs | 2 +- src/cli/sourcemap.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 { From 5eddcb94ac879cd87780da1f4be3334215262575 Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 7 May 2024 13:46:35 -0700 Subject: [PATCH 5/7] Update version of checkout action used in changelog CI --- .github/workflows/changelog.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 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: From 0ae26f4202390b08f598bc3a94b17e9190d4ec95 Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 3 Sep 2024 15:03:48 -0700 Subject: [PATCH 6/7] Update aftman version to v0.3.0 --- .github/workflows/ci.yml | 6 +++--- .github/workflows/release.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59c4f7233..8f7b8a027 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: - name: Setup Aftman uses: ok-nick/setup-aftman@v0.4.2 with: - version: 'v0.2.8' + version: 'v0.3.0' - name: Build run: cargo build --locked --verbose @@ -58,7 +58,7 @@ jobs: - name: Setup Aftman uses: ok-nick/setup-aftman@v0.4.2 with: - version: 'v0.2.8' + version: 'v0.3.0' - name: Build run: cargo build --locked --verbose @@ -83,7 +83,7 @@ jobs: - name: Setup Aftman uses: ok-nick/setup-aftman@v0.4.2 with: - version: 'v0.2.8' + version: 'v0.3.0' - name: Stylua run: stylua --check plugin/src diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0bd4dc83d..3a486dfc8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: - name: Setup Aftman uses: ok-nick/setup-aftman@v0.4.2 with: - version: 'v0.2.8' + version: 'v0.3.0' - name: Build Plugin run: rojo build plugin --output Rojo.rbxm From be97f0d5d276f55712b39fdba0c9b2b5fee49faf Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 3 Sep 2024 15:32:28 -0700 Subject: [PATCH 7/7] Upgrade version of aftman used for release workflow --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3a486dfc8..a1718858a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -89,7 +89,7 @@ jobs: - name: Setup Aftman uses: ok-nick/setup-aftman@v0.4.2 with: - version: 'v0.2.8' + version: 'v0.3.0' - name: Build Release run: cargo build --release --locked --verbose --target ${{ matrix.target }}