Skip to content

Commit 93418b7

Browse files
gragra33gragra33
committed
fix: address PR review comments — branch guard, snupkg, macOS path, Exists guard
1 parent 934c012 commit 93418b7

6 files changed

Lines changed: 74 additions & 16 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ jobs:
3030
3131
build-and-test:
3232
name: Build & Test (${{ matrix.framework }})
33+
needs: validate-branch
34+
# Run on push events (validate-branch skipped) OR on valid PRs (validate-branch succeeded)
35+
if: always() && (needs.validate-branch.result == 'success' || needs.validate-branch.result == 'skipped')
3336
runs-on: ubuntu-latest
3437
strategy:
3538
fail-fast: false # run all TFMs even if one fails

‎.github/workflows/release.yml‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ jobs:
7474
7575
- name: Create GitHub Release
7676
if: steps.tag_check.outputs.exists == 'false'
77-
uses: softprops/action-gh-release@v2
78-
with:
79-
tag_name: ${{ steps.version.outputs.tag }}
80-
name: Release ${{ steps.version.outputs.tag }}
81-
files: ./artifacts/*.nupkg
82-
generate_release_notes: true
8377
env:
8478
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
79+
run: |
80+
gh release create "${{ steps.version.outputs.tag }}" \
81+
--title "Release ${{ steps.version.outputs.tag }}" \
82+
--generate-notes \
83+
./artifacts/*.nupkg \
84+
./artifacts/*.snupkg
8585
8686
- name: Push Blazing.Mvvm.Base to NuGet.org
8787
if: steps.tag_check.outputs.exists == 'false'
@@ -100,3 +100,21 @@ jobs:
100100
--api-key ${{ secrets.NUGET_API_KEY }} \
101101
--source https://api.nuget.org/v3/index.json \
102102
--skip-duplicate
103+
104+
- name: Push Blazing.Mvvm.Base symbols to NuGet.org
105+
if: steps.tag_check.outputs.exists == 'false'
106+
run: |
107+
dotnet nuget push \
108+
"./artifacts/Blazing.Mvvm.Base.${{ steps.version.outputs.version }}.snupkg" \
109+
--api-key ${{ secrets.NUGET_API_KEY }} \
110+
--source https://api.nuget.org/v3/index.json \
111+
--skip-duplicate
112+
113+
- name: Push Blazing.Mvvm symbols to NuGet.org
114+
if: steps.tag_check.outputs.exists == 'false'
115+
run: |
116+
dotnet nuget push \
117+
"./artifacts/Blazing.Mvvm.${{ steps.version.outputs.version }}.snupkg" \
118+
--api-key ${{ secrets.NUGET_API_KEY }} \
119+
--source https://api.nuget.org/v3/index.json \
120+
--skip-duplicate

‎ci-cd-test-run.ps1‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,17 @@ if ($Mode -in @('dry', 'all') -and $dockerAvailable -and $hasAct) {
145145
Push-Location $RepoRoot
146146
try {
147147
$out = act push --workflows $wf.File -n 2>&1
148-
$failed = $out | Where-Object { $_ -match '(FAIL|error)' -and $_ -notmatch 'DRYRUN' }
149-
if ($LASTEXITCODE -eq 0 -and -not $failed) {
148+
# Filter known act Windows cache bug: upload-artifact@v4 fails to remove its own
149+
# .gitignore on Windows, causing a non-zero exit code even in dry-run mode.
150+
# Succeed if there are no real failures (excluding DRYRUN summary lines and artifact errors).
151+
$failed = $out | Where-Object {
152+
$_ -match '(FAIL|error)' -and
153+
$_ -notmatch 'DRYRUN' -and
154+
$_ -notmatch 'upload-artifact' -and
155+
$_ -notmatch '\.cache\\act\\actions-upload-artifact' -and
156+
$_ -notmatch 'The system cannot find the file specified'
157+
}
158+
if (-not $failed) {
150159
Write-Pass "$($wf.Name) dry-run succeeded"
151160
} else {
152161
$out | Where-Object { $_ -match '(FAIL|error|warn)' } | ForEach-Object { Write-Host " $_" -ForegroundColor Yellow }
@@ -188,11 +197,11 @@ if ($Mode -in @('ci', 'all') -and $dockerAvailable -and $hasAct) {
188197
}
189198
}
190199

191-
# Parse results
192-
$jobSucceeded = $outLines | Where-Object { $_ -match '🏁.*Job succeeded' }
193-
$jobFailed = $outLines | Where-Object { $_ -match '🏁.*Job failed' }
194-
$testPassed = $outLines | Where-Object { $_ -match 'Passed!.*Failed:\s+0' }
195-
$testFailed = $outLines | Where-Object { $_ -match 'Failed!.*Failed:\s+[^0]' }
200+
# Parse results — wrap in @() to ensure array even with 0 or 1 match
201+
$jobSucceeded = @($outLines | Where-Object { $_ -match '🏁.*Job succeeded' })
202+
$jobFailed = @($outLines | Where-Object { $_ -match '🏁.*Job failed' })
203+
$testPassed = @($outLines | Where-Object { $_ -match 'Passed!.*Failed:\s+0' })
204+
$testFailed = @($outLines | Where-Object { $_ -match 'Failed!.*Failed:\s+[^0]' })
196205

197206
Write-Host ''
198207
if ($testPassed.Count -gt 0) {
@@ -203,7 +212,7 @@ if ($Mode -in @('ci', 'all') -and $dockerAvailable -and $hasAct) {
203212
}
204213

205214
# Ignore ACTIONS_RUNTIME_TOKEN artifact upload errors (known act limitation)
206-
$realFailures = $jobFailed | Where-Object { $_ -notmatch 'Upload test results' }
215+
$realFailures = @($jobFailed | Where-Object { $_ -notmatch 'Upload test results' })
207216

208217
if ($LASTEXITCODE -eq 0 -or ($jobSucceeded.Count -gt 0 -and $realFailures.Count -eq 0)) {
209218
Write-Pass "$($wf.Name) workflow — all jobs succeeded"

‎src/Blazing.Mvvm.Analyzers.Tests/TestHelpers/CSharpAnalyzerVerifier.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ public static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[]
4949
private static string ResolveFrameworkAssembly(string packName, string targetFramework, string assemblyName)
5050
{
5151
var packRoot = Path.Combine(GetDotNetPacksRoot(), packName);
52+
if (!Directory.Exists(packRoot))
53+
throw new InvalidOperationException(
54+
$"dotnet packs directory not found: '{packRoot}'. " +
55+
$"Install the matching .NET SDK or set the DOTNET_ROOT environment variable.");
56+
5257
var packDirs = Directory.GetDirectories(packRoot)
5358
.OrderByDescending(static directory => directory, StringComparer.OrdinalIgnoreCase)
5459
.ToArray();
@@ -88,7 +93,11 @@ private static string GetDotNetPacksRoot()
8893
if (Path.DirectorySeparatorChar == '\\')
8994
return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "dotnet", "packs");
9095

91-
// Linux/macOS default install location
96+
// macOS official installer and Homebrew location
97+
if (Directory.Exists("/usr/local/share/dotnet/packs"))
98+
return "/usr/local/share/dotnet/packs";
99+
100+
// Linux default install location
92101
return "/usr/share/dotnet/packs";
93102
}
94103

‎src/Blazing.Mvvm.Analyzers.Tests/TestHelpers/CSharpCodeFixVerifier.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ public static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[]
6868
private static string ResolveFrameworkAssembly(string packName, string targetFramework, string assemblyName)
6969
{
7070
var packRoot = Path.Combine(GetDotNetPacksRoot(), packName);
71+
if (!Directory.Exists(packRoot))
72+
throw new InvalidOperationException(
73+
$"dotnet packs directory not found: '{packRoot}'. " +
74+
$"Install the matching .NET SDK or set the DOTNET_ROOT environment variable.");
75+
7176
var packDirs = Directory.GetDirectories(packRoot)
7277
.OrderByDescending(static directory => directory, StringComparer.OrdinalIgnoreCase)
7378
.ToArray();
@@ -103,6 +108,11 @@ private static string GetDotNetPacksRoot()
103108
if (Path.DirectorySeparatorChar == '\\')
104109
return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "dotnet", "packs");
105110

111+
// macOS official installer and Homebrew location
112+
if (Directory.Exists("/usr/local/share/dotnet/packs"))
113+
return "/usr/local/share/dotnet/packs";
114+
115+
// Linux default install location
106116
return "/usr/share/dotnet/packs";
107117
}
108118
}

‎src/Blazing.Mvvm.Analyzers.Tests/TestHelpers/CompilationEndAnalyzerVerifier.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@ private static IEnumerable<MetadataReference> GetMetadataReferences()
110110
private static string ResolveFrameworkAssembly(string packName, string targetFramework, string assemblyName)
111111
{
112112
var packRoot = Path.Combine(GetDotNetPacksRoot(), packName);
113+
if (!Directory.Exists(packRoot))
114+
throw new InvalidOperationException(
115+
$"dotnet packs directory not found: '{packRoot}'. " +
116+
$"Install the matching .NET SDK or set the DOTNET_ROOT environment variable.");
117+
113118
var packDirs = Directory.GetDirectories(packRoot)
114119
.OrderByDescending(static directory => directory, StringComparer.OrdinalIgnoreCase)
115120
.ToArray();
@@ -149,7 +154,11 @@ private static string GetDotNetPacksRoot()
149154
if (Path.DirectorySeparatorChar == '\\')
150155
return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "dotnet", "packs");
151156

152-
// Linux/macOS default install location
157+
// macOS official installer and Homebrew location
158+
if (Directory.Exists("/usr/local/share/dotnet/packs"))
159+
return "/usr/local/share/dotnet/packs";
160+
161+
// Linux default install location
153162
return "/usr/share/dotnet/packs";
154163
}
155164

0 commit comments

Comments
 (0)