Refine Linux sysroot and Avalonia host linking

Author: chsbuffer

.github/actions/sysroot-cache/action.yml

@@ -4,7 +4,7 @@ inputs:
   cache-key:
     description: Cache key for the packed sysroot tarball
     required: false
-    default: linux-sysroot-bionic-amd64-minbase
+    default: linux-sysroot-bionic-amd64
   sysroot-path:
     description: Directory to create with debootstrap
     required: false
@@ -24,7 +24,7 @@ inputs:
   include-packages:
     description: Comma-separated package list for debootstrap --include
     required: false
-    default: libfontconfig1-dev,gcc,libstdc++-7-dev
+    default: build-essential,symlinks,libicu-dev,liblttng-ust-dev,libunwind-dev,libcurl4-openssl-dev,libkrb5-dev,libssl-dev,zlib1g-dev,libbrotli-dev,libfontconfig1-dev,gcc,libstdc++-7-dev
   mirror:
     description: Ubuntu mirror URL passed to debootstrap
     required: false
@@ -42,12 +42,6 @@ outputs:
 runs:
   using: composite
   steps:
-    - name: Checkout repository
-      uses: actions/checkout@v6
-      with:
-        fetch-depth: 1
-        submodules: false
-
     - name: Resolve sysroot paths
       id: paths
       shell: bash
@@ -95,10 +89,12 @@ runs:
           --force-check-gpg \
           --include='${{ inputs.include-packages }}' \
           --arch '${{ inputs.arch }}' \
+          --components='main,universe' \
+          --extra-suites='${{ inputs.release }}-updates,${{ inputs.release }}-security,${{ inputs.release }}-backports' \
           '${{ inputs.release }}' \
           "$sysroot_path" \
           '${{ inputs.mirror }}'
 
-        sudo chown -R "$(id -u):$(id -g)" "$sysroot_path"
+        sudo chroot "$sysroot_path" symlinks -cr /usr
 
         bash ./scripts/sysroot-util.sh pack "$sysroot_path"

.github/actions/sysroot-restore/action.yml

@@ -4,7 +4,7 @@ inputs:
   cache-key:
     description: Cache key for the packed sysroot tarball
     required: false
-    default: linux-sysroot-bionic-amd64-minbase
+    default: linux-sysroot-bionic-amd64
   sysroot-path:
     description: Directory where the sysroot should be unpacked
     required: false
@@ -19,12 +19,6 @@ outputs:
 runs:
   using: composite
   steps:
-    - name: Checkout repository
-      uses: actions/checkout@v6
-      with:
-        fetch-depth: 1
-        submodules: false
-
     - name: Resolve sysroot paths
       id: paths
       shell: bash

.github/workflows/build.yml

@@ -6,6 +6,9 @@ on:
     branches:
       - main
 
+env:
+  LINUX_SYSROOT_CACHE_KEY: linux-sysroot-bionic-amd64
+
 # Keep the job graph below in sync with the Mermaid workflow diagram in README.md.
 jobs:
   windows-hostlibs:
@@ -240,7 +243,7 @@ jobs:
         run: python .\scripts\pipeline.py avalonia-test -v --target ${{ matrix.avalonia_target }}
 
   linux-sysroot:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repository
@@ -251,9 +254,11 @@ jobs:
 
       - name: Build and cache Linux sysroot
         uses: ./.github/actions/sysroot-cache
+        with:
+          cache-key: ${{ env.LINUX_SYSROOT_CACHE_KEY }}
 
   linux-hostlibs:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs:
       - linux-sysroot
 
@@ -267,6 +272,8 @@ jobs:
       - name: Restore Linux sysroot
         id: restore_sysroot
         uses: ./.github/actions/sysroot-restore
+        with:
+          cache-key: ${{ env.LINUX_SYSROOT_CACHE_KEY }}
 
       - name: Compute hostlibs cache key
         id: hostlibs_key
@@ -306,7 +313,7 @@ jobs:
           if-no-files-found: error
 
   linux-matrix-test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs:
       - linux-sysroot
       - linux-hostlibs
@@ -320,6 +327,8 @@ jobs:
 
       - name: Restore Linux sysroot
         uses: ./.github/actions/sysroot-restore
+        with:
+          cache-key: ${{ env.LINUX_SYSROOT_CACHE_KEY }}
 
       - name: Install LLVM
         run: |
@@ -343,7 +352,7 @@ jobs:
         run: python ./scripts/pipeline.py matrix -v
 
   linux-skia:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs:
       - linux-sysroot
     strategy:
@@ -366,6 +375,8 @@ jobs:
       - name: Restore Linux sysroot
         id: restore_sysroot
         uses: ./.github/actions/sysroot-restore
+        with:
+          cache-key: ${{ env.LINUX_SYSROOT_CACHE_KEY }}
 
       - name: Compute skia cache key
         id: skia_key
@@ -402,7 +413,7 @@ jobs:
           if-no-files-found: error
 
   linux-link-avalonia:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs:
       - linux-sysroot
       - linux-hostlibs
@@ -425,6 +436,8 @@ jobs:
       - name: Restore Linux sysroot
         id: restore_sysroot
         uses: ./.github/actions/sysroot-restore
+        with:
+          cache-key: ${{ env.LINUX_SYSROOT_CACHE_KEY }}
 
       - name: Compute hostlibs cache key
         id: hostlibs_key
@@ -456,7 +469,7 @@ jobs:
         run: python ./scripts/pipeline.py link-avalonia -v --target ${{ matrix.avalonia_target }} --os linux --sysroot "${{ steps.restore_sysroot.outputs.sysroot-path }}"
 
       - name: Run Avalonia App Host package tests
-        run: python ./scripts/pipeline.py avalonia-test -v --target ${{ matrix.avalonia_target }}
+        run: python ./scripts/pipeline.py avalonia-test -v --target ${{ matrix.avalonia_target }} --sysroot "${{ steps.restore_sysroot.outputs.sysroot-path }}"
 
       - name: Upload Linux Avalonia apphost artifact
         uses: actions/upload-artifact@v6

scripts/pipeline.py

@@ -132,6 +132,8 @@ def run_avalonia_test():
     header("Run avalonia apphost test")
     env = dict(os.environ)
     env["TargetAvaloniaVersion"] = args.target
+    if args.sysroot:
+        env["ROOTFS_DIR"] = args.sysroot
     cmd = ["dotnet", "test", "--project", AVALONIA_TEST_CSPROJ, "-c", "Release"]
     cmd.extend([f"-v:{dotnet_verbosity()}"])
     execv(cmd, env=env)
@@ -211,6 +213,10 @@ def parse_args():
         default="11.0",
         help="Target Avalonia version. This decides skiasharp version and changes output package version",
     )
+    avalonia_test_parser.add_argument(
+        "--sysroot",
+        help="optional sysroot path exposed to tests as ROOTFS_DIR",
+    )
     avalonia_test_parser.add_argument(
         "-v", "--verbose", action="count", default=0, help="verbose output"
     )

src/package-avalonia-apphost/AvaloniaAppHost.Link.proj

@@ -27,6 +27,8 @@
     <AvaloniaTemplateTfm Condition="'$(AvaloniaTemplateTfm)' == ''">net10.0</AvaloniaTemplateTfm>
     <AvaloniaAppHostArtifactRoot>$([MSBuild]::NormalizePath('$(RepoRoot)', 'artifacts/avalonia-host/$(TargetAvaloniaVersion)'))</AvaloniaAppHostArtifactRoot>
     <_ResolvedSysroot Condition="'$(Sysroot)' != ''">$([MSBuild]::NormalizePath('$(RepoRoot)', '$(Sysroot)'))</_ResolvedSysroot>
+    <_AvaloniaAppHostExportsFile>$([MSBuild]::NormalizePath('$(MSBuildProjectDirectory)', 'apphost.exports'))</_AvaloniaAppHostExportsFile>
+    <_AvaloniaSingleFileHostExportsFile>$([MSBuild]::NormalizePath('$(MSBuildProjectDirectory)', 'singlefilehost.exports'))</_AvaloniaSingleFileHostExportsFile>
 
     <StaticHostRid>$(AvaloniaHostRid)</StaticHostRid>
     <ComputeNETCoreBuildOutputFiles>true</ComputeNETCoreBuildOutputFiles>
@@ -92,19 +94,28 @@
                  Condition="'$(_AvaloniaHostRidIsWindows)' == 'True'" />
       <LinkerArg Include="--sysroot=&quot;$(_ResolvedSysroot)&quot;"
                  Condition="'$(_AvaloniaHostRidIsWindows)' != 'True' and '$(_ResolvedSysroot)' != ''" />
-      <LinkerArg Include="-lfontconfig -Wl,--version-script=$([MSBuild]::NormalizePath('singlefilehost.exports'))"
+      <LinkerArg Include="-lfontconfig"
                  Condition="'$(_AvaloniaHostRidIsWindows)' != 'True'" />
+      <LinkerArg Include="-Wl,--version-script=$(AvaloniaExportsFile)"
+                 Condition="'$(_AvaloniaHostRidIsWindows)' != 'True' and '$(AvaloniaExportsFile)' != ''" />
     </ItemGroup>
   </Target>
 
-  <Target Name="_LinkAvaloniaHostsForRid"
-          DependsOnTargets="_ResolveAvaloniaLinkInputs;LinkAppHost;LinkSingleFileHost" />
+  <Target Name="_LinkAvaloniaAppHostForRid"
+          DependsOnTargets="_ResolveAvaloniaLinkInputs;LinkAppHost" />
+
+  <Target Name="_LinkAvaloniaSingleFileHostForRid"
+          DependsOnTargets="_ResolveAvaloniaLinkInputs;LinkSingleFileHost" />
 
   <Target Name="LinkAvaloniaHosts"
           DependsOnTargets="_ResolveAvaloniaTargetRids">
     <MSBuild Projects="$(MSBuildProjectFullPath)"
-             Targets="_LinkAvaloniaHostsForRid"
+             Targets="_LinkAvaloniaAppHostForRid"
+             BuildInParallel="false"
+             Properties="Configuration=$(Configuration);TargetAvaloniaVersion=$(TargetAvaloniaVersion);HostLibsRoot=$(HostLibsRoot);AvaloniaNativeLibsRoot=$(AvaloniaNativeLibsRoot);AvaloniaAppHostArtifactRoot=$(AvaloniaAppHostArtifactRoot);AvaloniaTemplateTfm=$(AvaloniaTemplateTfm);AvaloniaHostRid=%(_AvaloniaTargetRid.Identity);Sysroot=$(_ResolvedSysroot);AvaloniaExportsFile=$(_AvaloniaAppHostExportsFile)" />
+    <MSBuild Projects="$(MSBuildProjectFullPath)"
+             Targets="_LinkAvaloniaSingleFileHostForRid"
              BuildInParallel="false"
-             Properties="Configuration=$(Configuration);TargetAvaloniaVersion=$(TargetAvaloniaVersion);HostLibsRoot=$(HostLibsRoot);AvaloniaNativeLibsRoot=$(AvaloniaNativeLibsRoot);AvaloniaAppHostArtifactRoot=$(AvaloniaAppHostArtifactRoot);AvaloniaTemplateTfm=$(AvaloniaTemplateTfm);AvaloniaHostRid=%(_AvaloniaTargetRid.Identity);Sysroot=$(_ResolvedSysroot)" />
+             Properties="Configuration=$(Configuration);TargetAvaloniaVersion=$(TargetAvaloniaVersion);HostLibsRoot=$(HostLibsRoot);AvaloniaNativeLibsRoot=$(AvaloniaNativeLibsRoot);AvaloniaAppHostArtifactRoot=$(AvaloniaAppHostArtifactRoot);AvaloniaTemplateTfm=$(AvaloniaTemplateTfm);AvaloniaHostRid=%(_AvaloniaTargetRid.Identity);Sysroot=$(_ResolvedSysroot);AvaloniaExportsFile=$(_AvaloniaSingleFileHostExportsFile)" />
   </Target>
 </Project>

src/package-avalonia-apphost/apphost.exports

@@ -0,0 +1,17 @@
+libSkiaSharp {
+    global:
+        sk_*;
+        gr_*;
+        skottie_*;
+        sksg_*;
+        skresources_*;
+    local:
+        *;
+};
+
+libHarfBuzzSharp {
+    global:
+        hb_*;
+    local:
+        *;
+};

tests/HostForge.TestInfra/AvaloniaPackageBuilder.cs

@@ -4,6 +4,7 @@ public static class AvaloniaPackageBuilder
 {
     private static readonly SemaphoreSlim Lock = new(1, 1);
     private static readonly HashSet<string> PackedModes = new(StringComparer.Ordinal);
+    private const string RootfsDirEnvironmentVariableName = "ROOTFS_DIR";
 
     public static async Task EnsurePackedAsync(
         string packageMode = "windows",
@@ -42,7 +43,8 @@ public static async Task EnsurePackedAsync(
 
             CommandResult result = await CommandRunner.RunAsync(
                 "dotnet",
-                RepoContext.AppendTargetAvaloniaVersionProperty($"pack \"{project}\" -c Release -v:minimal -p:AvaloniaAppHostPackageMode={packageMode}"),
+                RepoContext.AppendTargetAvaloniaVersionProperty(
+                    $"pack \"{project}\" -c Release -v:minimal -p:AvaloniaAppHostPackageMode={packageMode}{BuildSysrootPropertyArgument()}"),
                 RepoContext.RepoRoot,
                 cancellationToken);
 
@@ -59,4 +61,15 @@ public static async Task EnsurePackedAsync(
             Lock.Release();
         }
     }
+
+    private static string BuildSysrootPropertyArgument()
+    {
+        string? rootfsDir = Environment.GetEnvironmentVariable(RootfsDirEnvironmentVariableName);
+        if (string.IsNullOrWhiteSpace(rootfsDir))
+        {
+            return string.Empty;
+        }
+
+        return $" -p:Sysroot=\"{rootfsDir.Trim()}\"";
+    }
 }