diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 611855c99..caec99c6b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -106,7 +106,7 @@ stages:
echo "Extra platforms already enabled"
else
echo "Enabling extra platform support"
- sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64;linux-x86/' $BUNDLEDVERSIONS
+ sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64/' "$BUNDLEDVERSIONS"
fi
displayName: Enable Extra Platform Support
- bash: ./build.sh --backend --enable-extra-platforms
@@ -130,10 +130,6 @@ stages:
artifact: linux-x64-tests
displayName: Publish linux-x64 Test Package
condition: and(succeeded(), eq(variables['osName'], 'Windows'))
- - publish: '$(testsFolder)/net8.0/linux-x86/publish'
- artifact: linux-x86-tests
- displayName: Publish linux-x86 Test Package
- condition: and(succeeded(), eq(variables['osName'], 'Windows'))
- publish: '$(testsFolder)/net8.0/linux-musl-x64/publish'
artifact: linux-musl-x64-tests
displayName: Publish linux-musl-x64 Test Package
@@ -313,14 +309,6 @@ stages:
tarCompression: 'gz'
includeRootFolder: false
rootFolderOrFile: $(artifactsFolder)/linux-musl-x64/net8.0
- - task: ArchiveFiles@2
- displayName: Create linux-x86 tar
- inputs:
- archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).linux-core-x86.tar.gz'
- archiveType: 'tar'
- tarCompression: 'gz'
- includeRootFolder: false
- rootFolderOrFile: $(artifactsFolder)/linux-x86/net8.0
- task: ArchiveFiles@2
displayName: Create linux-arm tar
inputs:
@@ -488,10 +476,6 @@ stages:
testName: 'Musl Net Core'
artifactName: linux-musl-x64-tests
containerImage: ghcr.io/servarr/testimages:alpine
- linux-x86:
- testName: 'linux-x86'
- artifactName: linux-x86-tests
- containerImage: ghcr.io/servarr/testimages:linux-x86
pool:
vmImage: ${{ variables.linuxImage }}
@@ -505,12 +489,6 @@ stages:
displayName: 'Install .NET'
inputs:
version: $(dotnetVersion)
- condition: and(succeeded(), ne(variables['testName'], 'linux-x86'))
- - bash: |
- SDKURL=$(curl -s https://api.github.com/repos/Servarr/dotnet-linux-x86/releases | jq -rc '.[].assets[].browser_download_url' | grep sdk-${DOTNETVERSION}.*gz$)
- curl -fsSL $SDKURL | tar xzf - -C /opt/dotnet
- displayName: 'Install .NET'
- condition: and(succeeded(), eq(variables['testName'], 'linux-x86'))
- checkout: none
- task: DownloadPipelineArtifact@2
displayName: Download Test Artifact
@@ -912,11 +890,6 @@ stages:
artifactName: linux-musl-x64-tests
containerImage: ghcr.io/servarr/testimages:alpine
pattern: 'Prowlarr.*.linux-musl-core-x64.tar.gz'
- linux-x86:
- testName: 'linux-x86'
- artifactName: linux-x86-tests
- containerImage: ghcr.io/servarr/testimages:linux-x86
- pattern: 'Prowlarr.*.linux-core-x86.tar.gz'
pool:
vmImage: ${{ variables.linuxImage }}
@@ -929,12 +902,6 @@ stages:
displayName: 'Install .NET'
inputs:
version: $(dotnetVersion)
- condition: and(succeeded(), ne(variables['testName'], 'linux-x86'))
- - bash: |
- SDKURL=$(curl -s https://api.github.com/repos/Servarr/dotnet-linux-x86/releases | jq -rc '.[].assets[].browser_download_url' | grep sdk-${DOTNETVERSION}.*gz$)
- curl -fsSL $SDKURL | tar xzf - -C /opt/dotnet
- displayName: 'Install .NET'
- condition: and(succeeded(), eq(variables['testName'], 'linux-x86'))
- checkout: none
- task: DownloadPipelineArtifact@2
displayName: Download Test Artifact
diff --git a/build.sh b/build.sh
index b8f13c518..dc9cf46f3 100755
--- a/build.sh
+++ b/build.sh
@@ -33,14 +33,14 @@ EnableExtraPlatformsInSDK()
echo "Extra platforms already enabled"
else
echo "Enabling extra platform support"
- sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64;linux-x86/' $BUNDLEDVERSIONS
+ sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64/' "$BUNDLEDVERSIONS"
fi
}
EnableExtraPlatforms()
{
if grep -qv freebsd-x64 src/Directory.Build.props; then
- sed -i'' -e "s^\(.*\)^\1;freebsd-x64;linux-x86^g" src/Directory.Build.props
+ sed -i'' -e "s^\(.*\)^\1;freebsd-x64^g" src/Directory.Build.props
fi
}
@@ -385,7 +385,6 @@ then
if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
then
PackageTests "net8.0" "freebsd-x64"
- PackageTests "net8.0" "linux-x86"
fi
else
PackageTests "$FRAMEWORK" "$RID"
@@ -426,7 +425,6 @@ then
if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
then
Package "net8.0" "freebsd-x64"
- Package "net8.0" "linux-x86"
fi
else
Package "$FRAMEWORK" "$RID"