Merge pull request #233 from datalust/dev

2022.1.0 Release

Author: nblumhardt

Build.Docker.ps1

@@ -3,12 +3,12 @@ $IsPublishedBuild = ($env:APPVEYOR_REPO_BRANCH -eq "main" -or $env:APPVEYOR_REPO
 
 $version = @{ $true = $env:APPVEYOR_BUILD_VERSION; $false = "99.99.99" }[$env:APPVEYOR_BUILD_VERSION -ne $NULL];
 $framework = "net6.0"
-$rid = "linux-x64"
-$tag = "datalust/seqcli-ci:$version"
+$image = "datalust/seqcli"
+$archs = @("x64", "arm64")
 
 function Execute-Tests
 {
-    & dotnet test ./test/SeqCli.Tests/SeqCli.Tests.csproj -c Release -f $framework /p:Configuration=Release /p:Platform=x64 /p:VersionPrefix=$version
+    & dotnet test ./test/SeqCli.Tests/SeqCli.Tests.csproj -c Release -f $framework /p:Configuration=Release /p:VersionPrefix=$version
     if ($LASTEXITCODE -ne 0) { exit 1 }
 
     cd ./test/SeqCli.EndToEnd/
@@ -22,16 +22,17 @@ function Execute-Tests
     cd ../..
 }
 
-function Build-DockerImage
+function Build-DockerImage($arch)
 {
-    & dotnet publish src/SeqCli/SeqCli.csproj -c Release -f $framework -r $rid /p:VersionPrefix=$version
+    $rid = "linux-$arch"
+    & dotnet publish src/SeqCli/SeqCli.csproj -c Release -f $framework -r $rid --self-contained /p:VersionPrefix=$version
     if($LASTEXITCODE -ne 0) { exit 2 }
 
-    & docker build -f dockerfiles/seqcli/Dockerfile -t $tag .
+    & docker build -f dockerfiles/seqcli/$rid.Dockerfile -t "$image-ci:$version-$arch" .
     if($LASTEXITCODE -ne 0) { exit 3 }
 }
 
-function Publish-DockerImage
+function Publish-DockerImage($arch)
 {
     $ErrorActionPreference = "SilentlyContinue"
 
@@ -40,7 +41,7 @@ function Publish-DockerImage
         if ($LASTEXITCODE) { exit 3 }
     }
 
-    & docker push $tag
+    & docker push "$image-ci:$version-$arch"
     if($LASTEXITCODE -ne 0) { exit 3 }
 
     $ErrorActionPreference = "Stop"
@@ -50,10 +51,12 @@ Push-Location $PSScriptRoot
 
 Execute-Tests
 
-Build-DockerImage
+foreach ($arch in $archs) {
+    Build-DockerImage($arch)
 
-if ($IsPublishedBuild) {
-    Publish-DockerImage
+    if ($IsPublishedBuild) {
+        Publish-DockerImage($arch)
+    }
 }
 
 Pop-Location

Build.ps1

@@ -5,12 +5,12 @@ $windowsTfmSuffix = '-windows'
 
 function Clean-Output
 {
-	if(Test-Path ./artifacts) { rm ./artifacts -Force -Recurse }
+    if(Test-Path ./artifacts) { rm ./artifacts -Force -Recurse }
 }
 
 function Restore-Packages
 {
-	& dotnet restore
+    & dotnet restore
     if($LASTEXITCODE -ne 0) { throw "Build failed" }
 }
 
@@ -22,46 +22,46 @@ function Execute-Tests
 
 function Create-ArtifactDir
 {
-	mkdir ./artifacts
+    mkdir ./artifacts
 }
 
 function Publish-Archives($version)
 {
-	$rids = @("linux-x64", "linux-musl-x64", "linux-arm64", "osx-x64", "win-x64")
-	foreach ($rid in $rids) {
-	    $tfm = $framework
-	    if ($rid -eq "win-x64") {
-	        $tfm = "$tfm$windowsTfmSuffix"
-	    }
-	    
-		& dotnet publish ./src/SeqCli/SeqCli.csproj -c Release -f $tfm -r $rid /p:VersionPrefix=$version
-	    if($LASTEXITCODE -ne 0) { throw "Build failed" }
-
-		# Make sure the archive contains a reasonable root filename
-		mv ./src/SeqCli/bin/Release/$tfm/$rid/publish/ ./src/SeqCli/bin/Release/$tfm/$rid/seqcli-$version-$rid/
-
-		if ($rid.StartsWith("win-")) {
-			& ./build/7-zip/7za.exe a -tzip ./artifacts/seqcli-$version-$rid.zip ./src/SeqCli/bin/Release/$tfm/$rid/seqcli-$version-$rid/
-		    if($LASTEXITCODE -ne 0) { throw "Build failed" }
-		} else {
-			& ./build/7-zip/7za.exe a -ttar seqcli-$version-$rid.tar ./src/SeqCli/bin/Release/$tfm/$rid/seqcli-$version-$rid/
-		    if($LASTEXITCODE -ne 0) { throw "Build failed" }
-
-			# Back to the original directory name
-			mv ./src/SeqCli/bin/Release/$tfm/$rid/seqcli-$version-$rid/ ./src/SeqCli/bin/Release/$tfm/$rid/publish/
-			
-			& ./build/7-zip/7za.exe a -tgzip ./artifacts/seqcli-$version-$rid.tar.gz seqcli-$version-$rid.tar
-		    if($LASTEXITCODE -ne 0) { throw "Build failed" }
-
-			rm seqcli-$version-$rid.tar
-		}
-	}
+    $rids = $([xml](Get-Content .\src\SeqCli\SeqCli.csproj)).Project.PropertyGroup.RuntimeIdentifiers.Split(';')
+    foreach ($rid in $rids) {
+        $tfm = $framework
+        if ($rid -eq "win-x64") {
+            $tfm = "$tfm$windowsTfmSuffix"
+        }
+
+        & dotnet publish ./src/SeqCli/SeqCli.csproj -c Release -f $tfm -r $rid --self-contained /p:VersionPrefix=$version
+        if($LASTEXITCODE -ne 0) { throw "Build failed" }
+
+        # Make sure the archive contains a reasonable root filename
+        mv ./src/SeqCli/bin/Release/$tfm/$rid/publish/ ./src/SeqCli/bin/Release/$tfm/$rid/seqcli-$version-$rid/
+
+        if ($rid.StartsWith("win-")) {
+            & ./build/7-zip/7za.exe a -tzip ./artifacts/seqcli-$version-$rid.zip ./src/SeqCli/bin/Release/$tfm/$rid/seqcli-$version-$rid/
+            if($LASTEXITCODE -ne 0) { throw "Build failed" }
+        } else {
+            & ./build/7-zip/7za.exe a -ttar seqcli-$version-$rid.tar ./src/SeqCli/bin/Release/$tfm/$rid/seqcli-$version-$rid/
+            if($LASTEXITCODE -ne 0) { throw "Build failed" }
+
+            # Back to the original directory name
+            mv ./src/SeqCli/bin/Release/$tfm/$rid/seqcli-$version-$rid/ ./src/SeqCli/bin/Release/$tfm/$rid/publish/
+            
+            & ./build/7-zip/7za.exe a -tgzip ./artifacts/seqcli-$version-$rid.tar.gz seqcli-$version-$rid.tar
+            if($LASTEXITCODE -ne 0) { throw "Build failed" }
+
+            rm seqcli-$version-$rid.tar
+        }
+    }
 }
 
 function Publish-DotNetTool($version)
-{	
-	# Tool packages have to target a single non-platform-specific TFM; doing this here is cleaner than attempting it in the CSPROJ directly
-	dotnet pack ./src/SeqCli/SeqCli.csproj -c Release --output ./artifacts /p:VersionPrefix=$version /p:TargetFrameworks=$framework
+{    
+    # Tool packages have to target a single non-platform-specific TFM; doing this here is cleaner than attempting it in the CSPROJ directly
+    dotnet pack ./src/SeqCli/SeqCli.csproj -c Release --output ./artifacts /p:VersionPrefix=$version /p:TargetFrameworks=$framework
     if($LASTEXITCODE -ne 0) { throw "Build failed" }
 }