From 4d6c3369c689f0fff994c2c64b70cd9ef5cec01c Mon Sep 17 00:00:00 2001 From: ta264 Date: Sat, 13 Nov 2021 14:15:02 +0000 Subject: [PATCH] New: Add osx-arm64 and linux-musl-arm builds (cherry picked from commit 4ce405728a3ae32c8d0282e8e2b758084e8e5864) --- azure-pipelines.yml | 31 ++++++++++++++++--- build.sh | 20 +++++++----- src/Directory.Build.props | 2 +- src/NzbDrone.Common/Radarr.Common.csproj | 2 +- .../Radarr.Core.Test.csproj | 2 +- src/NzbDrone.Core/Radarr.Core.csproj | 4 +-- .../Radarr.Mono.Test.csproj | 2 +- src/NzbDrone.Mono/Radarr.Mono.csproj | 2 +- 8 files changed, 46 insertions(+), 19 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 88179b74b..606ecf568 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -260,20 +260,35 @@ stages: includeRootFolder: false rootFolderOrFile: $(artifactsFolder)/win-x86/net6.0 - task: ArchiveFiles@2 - displayName: Create MacOS Core app + displayName: Create MacOS x64 Core app inputs: archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).osx-app-core-x64.zip' archiveType: 'zip' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/macos-app/net6.0 + rootFolderOrFile: $(artifactsFolder)/osx-x64-app/net6.0 - task: ArchiveFiles@2 - displayName: Create MacOS Core tar + displayName: Create MacOS x64 Core tar inputs: archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).osx-core-x64.tar.gz' archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/macos/net6.0 + rootFolderOrFile: $(artifactsFolder)/osx-x64/net6.0 + - task: ArchiveFiles@2 + displayName: Create MacOS arm64 Core app + inputs: + archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).osx-app-core-arm64.zip' + archiveType: 'zip' + includeRootFolder: false + rootFolderOrFile: $(artifactsFolder)/osx-arm64-app/net6.0 + - task: ArchiveFiles@2 + displayName: Create MacOS arm64 Core tar + inputs: + archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).osx-core-arm64.tar.gz' + archiveType: 'tar' + tarCompression: 'gz' + includeRootFolder: false + rootFolderOrFile: $(artifactsFolder)/osx-arm64/net6.0 - task: ArchiveFiles@2 displayName: Create Linux Core tar inputs: @@ -298,6 +313,14 @@ stages: tarCompression: 'gz' includeRootFolder: false rootFolderOrFile: $(artifactsFolder)/linux-arm/net6.0 + - task: ArchiveFiles@2 + displayName: Create ARM32 Linux Musl Core tar + inputs: + archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).linux-musl-core-arm.tar.gz' + archiveType: 'tar' + tarCompression: 'gz' + includeRootFolder: false + rootFolderOrFile: $(artifactsFolder)/linux-musl-arm/net6.0 - task: ArchiveFiles@2 displayName: Create ARM64 Linux Core tar inputs: diff --git a/build.sh b/build.sh index c96cd7de9..300e8aed7 100755 --- a/build.sh +++ b/build.sh @@ -140,12 +140,13 @@ PackageLinux() PackageMacOS() { local framework="$1" + local runtime="$2" - ProgressStart "Creating MacOS Package for $framework" + ProgressStart "Creating MacOS Package for $framework $runtime" - local folder=$artifactsFolder/macos/$framework/Radarr + local folder=$artifactsFolder/$runtime/$framework/Radarr - PackageFiles "$folder" "$framework" "osx-x64" + PackageFiles "$folder" "$framework" "$runtime" echo "Removing Service helpers" rm -f $folder/ServiceUninstall.* @@ -167,10 +168,11 @@ PackageMacOS() PackageMacOSApp() { local framework="$1" + local runtime="$2" - ProgressStart "Creating macOS App Package for $framework" + ProgressStart "Creating macOS App Package for $framework $runtime" - local folder=$artifactsFolder/macos-app/$framework + local folder="$artifactsFolder/$runtime-app/$framework" rm -rf $folder mkdir -p $folder @@ -178,7 +180,7 @@ PackageMacOSApp() mkdir -p $folder/Radarr.app/Contents/MacOS echo "Copying Binaries" - cp -r $artifactsFolder/macos/$framework/Radarr/* $folder/Radarr.app/Contents/MacOS + cp -r $artifactsFolder/$runtime/$framework/Radarr/* $folder/Radarr.app/Contents/MacOS echo "Removing Update Folder" rm -r $folder/Radarr.app/Contents/MacOS/Radarr.Update @@ -225,8 +227,8 @@ Package() PackageWindows "$framework" "$runtime" ;; osx) - PackageMacOS "$framework" - PackageMacOSApp "$framework" + PackageMacOS "$framework" "$runtime" + PackageMacOSApp "$framework" "$runtime" ;; esac } @@ -369,7 +371,9 @@ then Package "net6.0" "linux-arm64" Package "net6.0" "linux-musl-arm64" Package "net6.0" "linux-arm" + Package "net6.0" "linux-musl-arm" Package "net6.0" "osx-x64" + Package "net6.0" "osx-arm64" if [ "$ENABLE_BSD" = "YES" ]; then Package "net6.0" "freebsd-x64" diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 0d075a001..049ca6eeb 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -6,7 +6,7 @@ AnyCPU true - win-x64;win-x86;osx-x64;linux-x64;linux-musl-x64;linux-arm;linux-arm64;linux-musl-arm64 + win-x64;win-x86;osx-x64;osx-arm64;linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64 $(MSBuildThisFileDirectory)..\ diff --git a/src/NzbDrone.Common/Radarr.Common.csproj b/src/NzbDrone.Common/Radarr.Common.csproj index 72300e36c..4a3b72923 100644 --- a/src/NzbDrone.Common/Radarr.Common.csproj +++ b/src/NzbDrone.Common/Radarr.Common.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj index 8aa8189ff..0ebddafeb 100644 --- a/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/NzbDrone.Core/Radarr.Core.csproj b/src/NzbDrone.Core/Radarr.Core.csproj index 57e5a4dfb..24ca1e06c 100644 --- a/src/NzbDrone.Core/Radarr.Core.csproj +++ b/src/NzbDrone.Core/Radarr.Core.csproj @@ -5,7 +5,7 @@ - + @@ -17,7 +17,7 @@ - + diff --git a/src/NzbDrone.Mono.Test/Radarr.Mono.Test.csproj b/src/NzbDrone.Mono.Test/Radarr.Mono.Test.csproj index ab15421a7..6bb325618 100644 --- a/src/NzbDrone.Mono.Test/Radarr.Mono.Test.csproj +++ b/src/NzbDrone.Mono.Test/Radarr.Mono.Test.csproj @@ -7,7 +7,7 @@ See https://github.com/xamarin/XamarinComponents/issues/282 --> - + diff --git a/src/NzbDrone.Mono/Radarr.Mono.csproj b/src/NzbDrone.Mono/Radarr.Mono.csproj index dd17704f0..9eeea0d32 100644 --- a/src/NzbDrone.Mono/Radarr.Mono.csproj +++ b/src/NzbDrone.Mono/Radarr.Mono.csproj @@ -7,7 +7,7 @@ See https://github.com/xamarin/XamarinComponents/issues/282 --> - +