From 30f8f3dbb086e27bc45891ee1a964dd826071145 Mon Sep 17 00:00:00 2001 From: Dean Sheather Date: Wed, 23 Apr 2025 14:46:41 +1000 Subject: [PATCH] chore: upgrade to mutagen 0.18.2 --- MutagenSdk/Proto/filesystem/behavior/probe_mode.proto | 2 +- MutagenSdk/Proto/selection/selection.proto | 2 +- MutagenSdk/Proto/service/daemon/daemon.proto | 2 +- MutagenSdk/Proto/service/prompting/prompting.proto | 2 +- .../Proto/service/synchronization/synchronization.proto | 2 +- MutagenSdk/Proto/synchronization/compression/algorithm.proto | 2 +- MutagenSdk/Proto/synchronization/configuration.proto | 2 +- MutagenSdk/Proto/synchronization/core/change.proto | 2 +- MutagenSdk/Proto/synchronization/core/conflict.proto | 2 +- MutagenSdk/Proto/synchronization/core/entry.proto | 2 +- .../Proto/synchronization/core/ignore/ignore_vcs_mode.proto | 2 +- MutagenSdk/Proto/synchronization/core/ignore/syntax.proto | 2 +- MutagenSdk/Proto/synchronization/core/mode.proto | 2 +- MutagenSdk/Proto/synchronization/core/permissions_mode.proto | 2 +- MutagenSdk/Proto/synchronization/core/problem.proto | 2 +- .../Proto/synchronization/core/symbolic_link_mode.proto | 2 +- MutagenSdk/Proto/synchronization/hashing/algorithm.proto | 2 +- MutagenSdk/Proto/synchronization/rsync/receive.proto | 2 +- MutagenSdk/Proto/synchronization/scan_mode.proto | 2 +- MutagenSdk/Proto/synchronization/session.proto | 2 +- MutagenSdk/Proto/synchronization/stage_mode.proto | 2 +- MutagenSdk/Proto/synchronization/state.proto | 2 +- MutagenSdk/Proto/synchronization/version.proto | 2 +- MutagenSdk/Proto/synchronization/watch_mode.proto | 2 +- MutagenSdk/Proto/url/url.proto | 2 +- MutagenSdk/Update-Proto.ps1 | 5 +++-- scripts/Get-Mutagen.ps1 | 2 +- 27 files changed, 29 insertions(+), 28 deletions(-) diff --git a/MutagenSdk/Proto/filesystem/behavior/probe_mode.proto b/MutagenSdk/Proto/filesystem/behavior/probe_mode.proto index ecbaf4a..d9a7637 100644 --- a/MutagenSdk/Proto/filesystem/behavior/probe_mode.proto +++ b/MutagenSdk/Proto/filesystem/behavior/probe_mode.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/filesystem/behavior/probe_mode.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/filesystem/behavior/probe_mode.proto * * MIT License * diff --git a/MutagenSdk/Proto/selection/selection.proto b/MutagenSdk/Proto/selection/selection.proto index 55cddb1..5d239c0 100644 --- a/MutagenSdk/Proto/selection/selection.proto +++ b/MutagenSdk/Proto/selection/selection.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/selection/selection.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/selection/selection.proto * * MIT License * diff --git a/MutagenSdk/Proto/service/daemon/daemon.proto b/MutagenSdk/Proto/service/daemon/daemon.proto index f810b3e..fb2e0b4 100644 --- a/MutagenSdk/Proto/service/daemon/daemon.proto +++ b/MutagenSdk/Proto/service/daemon/daemon.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/service/daemon/daemon.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/service/daemon/daemon.proto * * MIT License * diff --git a/MutagenSdk/Proto/service/prompting/prompting.proto b/MutagenSdk/Proto/service/prompting/prompting.proto index 19ea8bb..b5f9567 100644 --- a/MutagenSdk/Proto/service/prompting/prompting.proto +++ b/MutagenSdk/Proto/service/prompting/prompting.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/service/prompting/prompting.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/service/prompting/prompting.proto * * MIT License * diff --git a/MutagenSdk/Proto/service/synchronization/synchronization.proto b/MutagenSdk/Proto/service/synchronization/synchronization.proto index 1e3d6b2..84fb62a 100644 --- a/MutagenSdk/Proto/service/synchronization/synchronization.proto +++ b/MutagenSdk/Proto/service/synchronization/synchronization.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/service/synchronization/synchronization.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/service/synchronization/synchronization.proto * * MIT License * diff --git a/MutagenSdk/Proto/synchronization/compression/algorithm.proto b/MutagenSdk/Proto/synchronization/compression/algorithm.proto index 96f972c..0eae47d 100644 --- a/MutagenSdk/Proto/synchronization/compression/algorithm.proto +++ b/MutagenSdk/Proto/synchronization/compression/algorithm.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/synchronization/compression/algorithm.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/synchronization/compression/algorithm.proto * * MIT License * diff --git a/MutagenSdk/Proto/synchronization/configuration.proto b/MutagenSdk/Proto/synchronization/configuration.proto index 3ba7fdc..2225bd6 100644 --- a/MutagenSdk/Proto/synchronization/configuration.proto +++ b/MutagenSdk/Proto/synchronization/configuration.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/synchronization/configuration.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/synchronization/configuration.proto * * MIT License * diff --git a/MutagenSdk/Proto/synchronization/core/change.proto b/MutagenSdk/Proto/synchronization/core/change.proto index 3779a25..019dfde 100644 --- a/MutagenSdk/Proto/synchronization/core/change.proto +++ b/MutagenSdk/Proto/synchronization/core/change.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/synchronization/core/change.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/synchronization/core/change.proto * * MIT License * diff --git a/MutagenSdk/Proto/synchronization/core/conflict.proto b/MutagenSdk/Proto/synchronization/core/conflict.proto index ea46bef..5531e93 100644 --- a/MutagenSdk/Proto/synchronization/core/conflict.proto +++ b/MutagenSdk/Proto/synchronization/core/conflict.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/synchronization/core/conflict.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/synchronization/core/conflict.proto * * MIT License * diff --git a/MutagenSdk/Proto/synchronization/core/entry.proto b/MutagenSdk/Proto/synchronization/core/entry.proto index 3b937a3..158b876 100644 --- a/MutagenSdk/Proto/synchronization/core/entry.proto +++ b/MutagenSdk/Proto/synchronization/core/entry.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/synchronization/core/entry.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/synchronization/core/entry.proto * * MIT License * diff --git a/MutagenSdk/Proto/synchronization/core/ignore/ignore_vcs_mode.proto b/MutagenSdk/Proto/synchronization/core/ignore/ignore_vcs_mode.proto index 9a347c8..0bb0fe1 100644 --- a/MutagenSdk/Proto/synchronization/core/ignore/ignore_vcs_mode.proto +++ b/MutagenSdk/Proto/synchronization/core/ignore/ignore_vcs_mode.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/synchronization/core/ignore/ignore_vcs_mode.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/synchronization/core/ignore/ignore_vcs_mode.proto * * MIT License * diff --git a/MutagenSdk/Proto/synchronization/core/ignore/syntax.proto b/MutagenSdk/Proto/synchronization/core/ignore/syntax.proto index 7db94d9..4ee76a1 100644 --- a/MutagenSdk/Proto/synchronization/core/ignore/syntax.proto +++ b/MutagenSdk/Proto/synchronization/core/ignore/syntax.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/synchronization/core/ignore/syntax.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/synchronization/core/ignore/syntax.proto * * MIT License * diff --git a/MutagenSdk/Proto/synchronization/core/mode.proto b/MutagenSdk/Proto/synchronization/core/mode.proto index 56fbea9..e509a20 100644 --- a/MutagenSdk/Proto/synchronization/core/mode.proto +++ b/MutagenSdk/Proto/synchronization/core/mode.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/synchronization/core/mode.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/synchronization/core/mode.proto * * MIT License * diff --git a/MutagenSdk/Proto/synchronization/core/permissions_mode.proto b/MutagenSdk/Proto/synchronization/core/permissions_mode.proto index e16648f..d920f4e 100644 --- a/MutagenSdk/Proto/synchronization/core/permissions_mode.proto +++ b/MutagenSdk/Proto/synchronization/core/permissions_mode.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/synchronization/core/permissions_mode.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/synchronization/core/permissions_mode.proto * * MIT License * diff --git a/MutagenSdk/Proto/synchronization/core/problem.proto b/MutagenSdk/Proto/synchronization/core/problem.proto index d58dec1..d83c892 100644 --- a/MutagenSdk/Proto/synchronization/core/problem.proto +++ b/MutagenSdk/Proto/synchronization/core/problem.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/synchronization/core/problem.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/synchronization/core/problem.proto * * MIT License * diff --git a/MutagenSdk/Proto/synchronization/core/symbolic_link_mode.proto b/MutagenSdk/Proto/synchronization/core/symbolic_link_mode.proto index 31bee64..5736678 100644 --- a/MutagenSdk/Proto/synchronization/core/symbolic_link_mode.proto +++ b/MutagenSdk/Proto/synchronization/core/symbolic_link_mode.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/synchronization/core/symbolic_link_mode.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/synchronization/core/symbolic_link_mode.proto * * MIT License * diff --git a/MutagenSdk/Proto/synchronization/hashing/algorithm.proto b/MutagenSdk/Proto/synchronization/hashing/algorithm.proto index 1cb2fa1..7fee4c1 100644 --- a/MutagenSdk/Proto/synchronization/hashing/algorithm.proto +++ b/MutagenSdk/Proto/synchronization/hashing/algorithm.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/synchronization/hashing/algorithm.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/synchronization/hashing/algorithm.proto * * MIT License * diff --git a/MutagenSdk/Proto/synchronization/rsync/receive.proto b/MutagenSdk/Proto/synchronization/rsync/receive.proto index 7d6b3f2..192298a 100644 --- a/MutagenSdk/Proto/synchronization/rsync/receive.proto +++ b/MutagenSdk/Proto/synchronization/rsync/receive.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/synchronization/rsync/receive.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/synchronization/rsync/receive.proto * * MIT License * diff --git a/MutagenSdk/Proto/synchronization/scan_mode.proto b/MutagenSdk/Proto/synchronization/scan_mode.proto index de1777f..1d35e48 100644 --- a/MutagenSdk/Proto/synchronization/scan_mode.proto +++ b/MutagenSdk/Proto/synchronization/scan_mode.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/synchronization/scan_mode.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/synchronization/scan_mode.proto * * MIT License * diff --git a/MutagenSdk/Proto/synchronization/session.proto b/MutagenSdk/Proto/synchronization/session.proto index c23985f..9e604b6 100644 --- a/MutagenSdk/Proto/synchronization/session.proto +++ b/MutagenSdk/Proto/synchronization/session.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/synchronization/session.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/synchronization/session.proto * * MIT License * diff --git a/MutagenSdk/Proto/synchronization/stage_mode.proto b/MutagenSdk/Proto/synchronization/stage_mode.proto index 247e0a9..8813cbf 100644 --- a/MutagenSdk/Proto/synchronization/stage_mode.proto +++ b/MutagenSdk/Proto/synchronization/stage_mode.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/synchronization/stage_mode.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/synchronization/stage_mode.proto * * MIT License * diff --git a/MutagenSdk/Proto/synchronization/state.proto b/MutagenSdk/Proto/synchronization/state.proto index 24d7e3f..147e274 100644 --- a/MutagenSdk/Proto/synchronization/state.proto +++ b/MutagenSdk/Proto/synchronization/state.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/synchronization/state.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/synchronization/state.proto * * MIT License * diff --git a/MutagenSdk/Proto/synchronization/version.proto b/MutagenSdk/Proto/synchronization/version.proto index 92a8c62..4bdb479 100644 --- a/MutagenSdk/Proto/synchronization/version.proto +++ b/MutagenSdk/Proto/synchronization/version.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/synchronization/version.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/synchronization/version.proto * * MIT License * diff --git a/MutagenSdk/Proto/synchronization/watch_mode.proto b/MutagenSdk/Proto/synchronization/watch_mode.proto index 624aa0b..bcfae1e 100644 --- a/MutagenSdk/Proto/synchronization/watch_mode.proto +++ b/MutagenSdk/Proto/synchronization/watch_mode.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/synchronization/watch_mode.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/synchronization/watch_mode.proto * * MIT License * diff --git a/MutagenSdk/Proto/url/url.proto b/MutagenSdk/Proto/url/url.proto index d514f5b..7983230 100644 --- a/MutagenSdk/Proto/url/url.proto +++ b/MutagenSdk/Proto/url/url.proto @@ -1,6 +1,6 @@ /* * This file was taken from - * https://github.com/mutagen-io/mutagen/tree/v0.18.1/pkg/url/url.proto + * https://github.com/coder/mutagen/tree/v0.18.2/pkg/url/url.proto * * MIT License * diff --git a/MutagenSdk/Update-Proto.ps1 b/MutagenSdk/Update-Proto.ps1 index 33e69e6..eb9992b 100644 --- a/MutagenSdk/Update-Proto.ps1 +++ b/MutagenSdk/Update-Proto.ps1 @@ -6,7 +6,7 @@ param ( $ErrorActionPreference = "Stop" -$repo = "mutagen-io/mutagen" +$repo = "coder/mutagen" $protoPrefix = "pkg" $entryFiles = @( "service/daemon/daemon.proto", @@ -24,7 +24,7 @@ if (Test-Path $cloneDir) { Push-Location $cloneDir try { & git.exe clean -fdx - if ($LASTEXITCODE -ne 0) { throw "Failed to clean $mutagenTag" } + if ($LASTEXITCODE -ne 0) { throw "Failed to clean $cloneDir" } # If we're already on the tag, we don't need to fetch or checkout. if ((& git.exe name-rev --name-only HEAD) -eq "tags/$mutagenTag") { Write-Host "Already on $mutagenTag" @@ -96,6 +96,7 @@ foreach ($entryFile in $entryFiles) { $repoRoot = Resolve-Path (Join-Path $PSScriptRoot "..") Push-Location $repoRoot +$outputDir = Resolve-Path $outputDir if (Test-Path $outputDir) { Remove-Item -Recurse -Force $outputDir } diff --git a/scripts/Get-Mutagen.ps1 b/scripts/Get-Mutagen.ps1 index c540809..fec8aa6 100644 --- a/scripts/Get-Mutagen.ps1 +++ b/scripts/Get-Mutagen.ps1 @@ -31,7 +31,7 @@ $goArch = switch ($arch) { # Download the mutagen binary from our bucket for this platform if we don't have # it yet (or it's different). -$mutagenVersion = "v0.18.1" +$mutagenVersion = "v0.18.2" $mutagenPath = Join-Path $PSScriptRoot "files\mutagen-windows-$($arch).exe" $mutagenUrl = "https://storage.googleapis.com/coder-desktop/mutagen/$($mutagenVersion)/mutagen-windows-$($goArch).exe" $mutagenEtagFile = $mutagenPath + ".etag"