Page MenuHomeSolus

Update godot to 3.1
Needs RevisionPublic

Authored by kyrios123 on Mar 28 2019, 12:33 PM.

Details

Reviewers
DataDrake
JoshStrobl
Group Reviewers
Triage Team
Maniphest Tasks
T7755: Update Godot to 3.1
Summary

Release announcement available here
Fixes T7755, depends on D7133

Signed-off-by: Pierre-Yves <pyu@riseup.net>

Test Plan

Create a new C# project with godot-mono

Diff Detail

Repository
R1031 godot
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

kyrios123 created this revision.Mar 28 2019, 12:33 PM
kyrios123 requested review of this revision.Mar 28 2019, 12:33 PM
kyrios123 edited the summary of this revision. (Show Details)Mar 28 2019, 1:43 PM
DataDrake accepted this revision.May 21 2019, 12:32 AM
DataDrake added a subscriber: DataDrake.

LGTM. Thanks!

This revision is now accepted and ready to land.May 21 2019, 12:32 AM
dotEls added a subscriber: dotEls.Jul 19 2019, 6:51 PM
robust added a subscriber: robust.Aug 9 2019, 11:13 AM

Has this been added to the repository yet? The latest version I can see in packages.getsol.us is 3.0.6

Nope it hasn't been landed because as you can see it depends on D5130 which has never been landed (and which is obsolete by now).

robust added a comment.Aug 9 2019, 2:31 PM

Nope it hasn't been landed because as you can see it depends on D5130 which has never been landed (and which is obsolete by now).

Ah ok that's a shame. Thought the lastest update on the mono dep was that it was accepted as well as godot. Oh well hope we get the new version eventually. Thanks for the info kyrious :)

Nope it hasn't been landed because as you can see it depends on D5130 which has never been landed (and which is obsolete by now).

Ah ok that's a shame. Thought the lastest update on the mono dep was that it was accepted as well as godot. Oh well hope we get the new version eventually. Thanks for the info kyrious :)

Feel free to commandeer or submit a new patch for mono since @watpi's account is disabled.

! In D5865#109399, @kyrios123 wrote:
Feel free to commandeer or submit a new patch for mono since @watpi's account is disabled.

Gonna do it.

JoshStrobl edited the summary of this revision. (Show Details)

@kyrios123 This fails to compile against current Mono, which is kinda problematic for libvpx rebuilds. Can we check if 3.1.1 resolves it?

JoshStrobl requested changes to this revision.Mon, Sep 16, 8:40 AM
This revision now requires changes to proceed.Mon, Sep 16, 8:40 AM

Were mono-msbuild and nuget already rebuild against the updated mono?

Were mono-msbuild and nuget already rebuild against the updated mono?

I don't believe so, no. I imagine it's mono-msbuild that likely needs an update, my guess is to upstream/16.3+xamarinxplat.2019.08.08.00.55. I'll take a look.

Were mono-msbuild and nuget already rebuild against the updated mono?

I didn't even believe this was necessary. I can update mono-msbuild as usual if you want.

I didn't even believe this was necessary. I can update mono-msbuild as usual if you want.

If you wanna take a crack at it, you are more than welcome to. I'm attempt to update it to upstream/16.3+xamarinxplat.2019.08.08.00.55 and it's failing at the following stage:

Build FAILED.

/home/build/YPKG/root/mono-msbuild/build/linux-packaging-msbuild.git/.packages/microsoft.dotnet.arcade.sdk/1.0.0-beta.19376.18/tools/Tools.proj : error MSB4242: The SDK resolver "Microsoft.DotNet.MSBuildSdkResolver" failed to run. hostfxr

This includes after copying the hostfxr.dylib to the MSBuildSdkResolver path:

build@goliath ~/YPKG/root/mono-msbuild/build/linux-packaging-msbuild.git/artifacts/mono-msbuild/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver $ ls -alh
total 980K
drwxr-xr-x 2 build build 4.0K Jun 20 18:14 .
drwxr-xr-x 4 build build 4.0K Jun 13 11:51 ..
-rw-r--r-- 1 build build  19K Jun 13 09:04 Microsoft.DotNet.MSBuildSdkResolver.dll
-rw-r--r-- 1 build build 4.8K Jun 13 09:04 Microsoft.DotNet.MSBuildSdkResolver.pdb
-rw-r--r-- 1 build build 944K Sep 16 12:16 libhostfxr.dylib

Patch below:

From 82c86c3530b6650a99b261ae3850dabcaf05b653 Mon Sep 17 00:00:00 2001
From: Joshua Strobl <joshua@streambits.io>
Date: Mon, 16 Sep 2019 14:55:00 +0300
Subject: [PATCH 1/1] Copy libhostfxr

---
 eng/cibuild_bootstrapped_msbuild.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/cibuild_bootstrapped_msbuild.sh b/eng/cibuild_bootstrapped_msbuild.sh
index 3f7c107..603367a 100755
--- a/eng/cibuild_bootstrapped_msbuild.sh
+++ b/eng/cibuild_bootstrapped_msbuild.sh
@@ -56,6 +56,7 @@ function DownloadMSBuildForMono {
     unzip -q "$msbuild_zip" -d "$artifacts_dir"
     # rename just to make it obvious when reading logs!
     mv $artifacts_dir/msbuild $mono_msbuild_dir
+    cp /usr/lib/mono/msbuild/15.0/bin/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver/libhostfxr.dylib $artifacts_dir/mono-msbuild/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver/
     chmod +x $artifacts_dir/mono-msbuild/MSBuild.dll
     rm "$msbuild_zip"
   fi
-- 
2.23.0

Could be the result of us having a dylib instead of shared object file, per https://github.com/mono/linux-packaging-msbuild/blob/master/debian/patches/copy_hostfxr.patch. Also be sure to copy LICENSE to license in setup stage otherwise it'll fail early.

A bit out of scope, but perhaps it would be good to move the nuget archive on the getsol.us web server to make sure it's not missing when rebuilds are needed.

A bit out of scope, but perhaps it would be good to move the nuget archive on the getsol.us web server to make sure it's not missing when rebuilds are needed.

Yea probably not a bad idea. We could also see if using ypkg's git support and https://github.com/NuGet/NuGet.Client is a viable alternative. Our nuget is extremely old.

FWIW, it looks like all other distros are also stuck with a nuget 2.x