Skip to content

Commit 0c6f4df

Browse files
committed
Use Tizen dotnet-core myget in Tizen CI
Removed related workaround codes
1 parent 00b2a85 commit 0c6f4df

File tree

1 file changed

+5
-33
lines changed

1 file changed

+5
-33
lines changed

cross/arm32_ci_script.sh

+5-33
Original file line numberDiff line numberDiff line change
@@ -233,41 +233,13 @@ function cross_build_corefx_with_docker {
233233
fi
234234

235235
# Cross building corefx with rootfs in Docker
236-
__buildNativeCmd="/opt/corefx/build-native.sh -buildArch=$__buildArch -$__buildConfig -- cross $__verboseFlag"
237-
if [ "$__buildArch" == "arm" ]; then
238-
__buildManagedCmd="./build-managed.sh -$__buildConfig -buildArch=$__buildArch -RuntimeOS=$__runtimeOS"
239-
else
240-
# TODO-armel: We can use same option to arm, i.e. -buildArch and -RuntimeOS options for armel,
241-
# when CoreCLR packages are also available at NuGet server for armel.
242-
__buildManagedCmd="./build-managed.sh -$__buildConfig -BuildPackages=false"
243-
244-
fi
245-
$__dockerCmd $__buildNativeCmd
246-
$__dockerCmd $__buildManagedCmd
247-
sudo chown -R $(id -u -n) ./bin
248-
249236
if [ "$__buildArch" == "armel" ]; then
250-
# TODO-armel: This is a workaround. We don't need this if we can build managed for armel in above.
251-
# Construct runtime directory
252-
if [[ "$__buildConfig" == "release" ]]; then
253-
__runtimePath="./bin/runtime/netcoreapp-Linux-Release-armel"
254-
__nativePath="./bin/Linux.armel.Release/native"
255-
__managedPath="./bin/runtime/netcoreapp-Linux-Release-x64"
256-
else
257-
__runtimePath="./bin/runtime/netcoreapp-Linux-Debug-armel"
258-
__nativePath="./bin/Linux.armel.Debug/native"
259-
__managedPath="./bin/runtime/netcoreapp-Linux-Debug-x64"
260-
fi
237+
__extraCmd="/p:OverridePackageSource=https://tizen.myget.org/F/dotnet-core/api/v3/index.json"
238+
fi
261239

262-
mkdir $__runtimePath
263-
pushd $__managedPath
264-
rm apphost corerun dotnet
265-
rm *.so
266-
popd
267-
cp $__nativePath/* $__runtimePath/
268-
mv $__managedPath/* $__runtimePath/
269-
rmdir $__managedPath
270-
fi
240+
__buildCmd="./build.sh -buildArch=$__buildArch -$__buildConfig -RuntimeOS=$__runtimeOS -- $__extraCmd"
241+
$__dockerCmd $__buildCmd
242+
sudo chown -R $(id -u -n) ./bin
271243
}
272244

273245
#Define script variables

0 commit comments

Comments
 (0)