Split AvaloniaNative static package

2026-06-21 10:30:29 +08:00
1 parent aa0118a4e3
commit a700f4a124
@@ -98,6 +98,11 @@ jobs:
            -o artifacts/nuget \
            /p:PackageVersion=${{ steps.version.outputs.package_version }} \
            /p:Version=${{ steps.version.outputs.package_version }}
+          dotnet pack NuGet/AvaloniaNative/StaticLink.Avalonia.Native.csproj \
+            -c Release \
+            -o artifacts/nuget \
+            /p:PackageVersion=11.3.14-macavn.${{ github.run_number }} \
+            /p:Version=11.3.14-macavn.${{ github.run_number }}

      - name: Upload experimental NuGet package
        uses: actions/upload-artifact@v4
@@ -136,10 +141,15 @@ jobs:
        run: |
          $ErrorActionPreference = "Stop"
          $projectDir = Join-Path $PWD "artifacts/avalonia-smoke-src"
+          $nativePackage = Get-ChildItem -Path "artifacts/nuget" -Filter "StaticLink.Avalonia.Native.*.nupkg" | Select-Object -First 1
+          if (-not $nativePackage) { throw "StaticLink AvaloniaNative NuGet package was not downloaded." }
+          if ($nativePackage.BaseName -notmatch '^StaticLink\.Avalonia\.Native\.(.+)$') { throw "Unexpected native package name: $($nativePackage.Name)" }
+          $nativeVersion = $Matches[1]
          pwsh ./scripts/create-avalonia-smoke.ps1 `
            -ProjectDir $projectDir `
            -NuGetSource (Resolve-Path "artifacts/nuget") `
-            -StaticLinkVersion "${{ needs.pack-experimental.outputs.package_version }}"
+            -StaticLinkVersion "${{ needs.pack-experimental.outputs.package_version }}" `
+            -StaticLinkNativeVersion $nativeVersion
          dotnet publish (Join-Path $projectDir "AvaloniaStaticLinkSmoke.csproj") `
            -c Release `
            -r "${{ matrix.rid }}" `
@@ -131,21 +131,12 @@ jobs:
      TARGET_CPU: ${{ matrix.target_cpu }}
      WORK_DIR: ${{ github.workspace }}/External/NativeStatic/.work
      OUTPUT_DIR: ${{ github.workspace }}/External/NativeStatic/${{ matrix.rid }}/native
-      AVALONIA_VERSION: 11.3.14
    steps:
      - uses: actions/checkout@v4

-      - name: Setup .NET for Avalonia header generation
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: "8.0.x"
-
      - name: Install native build dependencies
        run: brew install ninja

-      - name: Build static AvaloniaNative
-        run: bash ./scripts/build-macos-avalonia-native-static.sh
-
      - name: Build macOS static graphics libraries
        run: bash ./scripts/build-macos-static-graphics.sh all

@@ -159,12 +150,61 @@ jobs:
          path: External/NativeStatic/${{ matrix.rid }}/*
          if-no-files-found: error

+  build-macos-avalonia-native:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - rid: osx-x64
+            runner: macos-14
+            avalonia_version: 11.3.14
+          - rid: osx-arm64
+            runner: macos-latest
+            avalonia_version: 11.3.14
+          - rid: osx-x64
+            runner: macos-14
+            avalonia_version: 12.0.3
+          - rid: osx-arm64
+            runner: macos-latest
+            avalonia_version: 12.0.3
+    runs-on: ${{ matrix.runner }}
+    env:
+      RID: ${{ matrix.rid }}
+      WORK_DIR: ${{ github.workspace }}/External/NativeStatic/.work
+      OUTPUT_DIR: ${{ github.workspace }}/External/NativeStatic/${{ matrix.rid }}/native
+      AVALONIA_VERSION: ${{ matrix.avalonia_version }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup .NET for Avalonia header generation
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            8.0.x
+            10.0.x
+
+      - name: Build static AvaloniaNative
+        run: bash ./scripts/build-macos-avalonia-native-static.sh
+
+      - name: Build macOS font preinit object
+        run: bash scripts/build-macos-font-preinit.sh
+
+      - name: Upload static AvaloniaNative
+        uses: actions/upload-artifact@v4
+        with:
+          name: native-avalonia-${{ matrix.avalonia_version }}-${{ matrix.rid }}
+          path: |
+            External/NativeStatic/${{ matrix.rid }}/native/libAvaloniaNative.a
+            External/NativeStatic/${{ matrix.rid }}/native/macos_font_preinit.o
+          if-no-files-found: error
+
  pack:
    runs-on: ubuntu-latest
    needs:
      - build-linux
      - build-windows
      - build-macos
+      - build-macos-avalonia-native
    permissions:
      contents: read
    steps:
@@ -182,6 +222,13 @@ jobs:
          path: External/NativeStatic
          merge-multiple: false

+      - name: Download static AvaloniaNative archives
+        uses: actions/download-artifact@v4
+        with:
+          pattern: native-avalonia-*
+          path: External/AvaloniaNative
+          merge-multiple: false
+
      - name: Move static archives into RID directories
        run: |
          for rid in win-x64 win-arm64 linux-x64 linux-arm64 osx-x64 osx-arm64; do
@@ -200,11 +247,6 @@ jobs:
            test -f External/NativeStatic/$rid/native/libGLESv2_static.a
          done

-          for rid in osx-x64 osx-arm64; do
-            test -f External/NativeStatic/$rid/native/libAvaloniaNative.a
-            test -f External/NativeStatic/$rid/native/macos_font_preinit.o
-          done
-
          for rid in win-x64 win-arm64; do
            test -f External/NativeStatic/$rid/native/skia.lib
            test -f External/NativeStatic/$rid/native/SkiaSharp.lib
@@ -214,7 +256,18 @@ jobs:
          done

      - name: Pack NuGet package
-        run: dotnet pack NuGet/StaticGraphics/StaticLink.Avalonia.csproj -c Release -o artifacts/nuget
+        run: |
+          dotnet pack NuGet/StaticGraphics/StaticLink.Avalonia.csproj -c Release -o artifacts/nuget
+          for version in 11.3.14 12.0.3; do
+            mkdir -p External/NativeStatic/osx-x64/native External/NativeStatic/osx-arm64/native
+            cp External/AvaloniaNative/native-avalonia-$version-osx-x64/* External/NativeStatic/osx-x64/native/
+            cp External/AvaloniaNative/native-avalonia-$version-osx-arm64/* External/NativeStatic/osx-arm64/native/
+            dotnet pack NuGet/AvaloniaNative/StaticLink.Avalonia.Native.csproj \
+              -c Release \
+              -o artifacts/nuget \
+              /p:PackageVersion=$version.1 \
+              /p:Version=$version.1
+          done

      - name: Upload NuGet artifact
        uses: actions/upload-artifact@v4
@@ -260,8 +313,20 @@ jobs:
            runner: ubuntu-24.04-arm
          - rid: osx-x64
            runner: macos-14
+            avalonia_version: 11.3.14
+            native_version: 11.3.14.1
          - rid: osx-arm64
            runner: macos-latest
+            avalonia_version: 11.3.14
+            native_version: 11.3.14.1
+          - rid: osx-x64
+            runner: macos-14
+            avalonia_version: 12.0.3
+            native_version: 12.0.3.1
+          - rid: osx-arm64
+            runner: macos-latest
+            avalonia_version: 12.0.3
+            native_version: 12.0.3.1
    runs-on: ${{ matrix.runner }}
    steps:
      - uses: actions/checkout@v4
@@ -293,12 +358,19 @@ jobs:
        shell: pwsh
        run: |
          $ErrorActionPreference = "Stop"
-          $package = Get-ChildItem -Path "artifacts/nuget" -Filter "StaticLink.Avalonia.*.nupkg" | Select-Object -First 1
+          $package = Get-ChildItem -Path "artifacts/nuget" -Filter "StaticLink.Avalonia.*.nupkg" | Where-Object { $_.Name -notlike "StaticLink.Avalonia.Native.*" } | Select-Object -First 1
          if (-not $package) { throw "StaticLink NuGet package was not downloaded." }
          if ($package.BaseName -notmatch '^StaticLink\.Avalonia\.(.+)$') { throw "Unexpected package name: $($package.Name)" }
          $version = $Matches[1]
+          $nativeVersion = "${{ matrix.native_version }}"
+          $avaloniaVersion = "${{ matrix.avalonia_version }}"
+          if (-not $avaloniaVersion) { $avaloniaVersion = "11.3.14" }
+          if ($nativeVersion) {
+            $nativePackage = Get-ChildItem -Path "artifacts/nuget" -Filter "StaticLink.Avalonia.Native.$nativeVersion.nupkg" | Select-Object -First 1
+            if (-not $nativePackage) { throw "StaticLink AvaloniaNative NuGet package $nativeVersion was not downloaded." }
+          }
          $projectDir = Join-Path $PWD "artifacts/avalonia-smoke-src"
-          pwsh ./scripts/create-avalonia-smoke.ps1 -ProjectDir $projectDir -NuGetSource (Resolve-Path "artifacts/nuget") -StaticLinkVersion $version
+          pwsh ./scripts/create-avalonia-smoke.ps1 -ProjectDir $projectDir -NuGetSource (Resolve-Path "artifacts/nuget") -StaticLinkVersion $version -AvaloniaVersion $avaloniaVersion -StaticLinkNativeVersion $nativeVersion
          dotnet publish (Join-Path $projectDir "AvaloniaStaticLinkSmoke.csproj") `
            -c Release `
            -r "${{ matrix.rid }}" `