Update build-and-test.yml

Author: JimBobSquarePants

.github/workflows/build-and-test.yml

@@ -11,21 +11,65 @@ on:
     branches:
       - main
       - release/*
-    types: [ labeled, opened, synchronize, reopened ]
+    types: [ opened, synchronize, reopened ]
+
 jobs:
+  # Prime a single LFS cache and expose the exact key for the matrix
+  WarmLFS:
+    runs-on: ubuntu-latest
+    outputs:
+      lfs_key: ${{ steps.expose-key.outputs.lfs_key }}
+    steps:
+      - name: Git Config
+        shell: bash
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.longpaths true
+
+      - name: Git Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      # Deterministic list of LFS object IDs, then compute a portable key:
+      # - `git lfs ls-files -l` lists all tracked LFS objects with their SHA-256
+      # - `awk '{print $1}'` extracts just the SHA field
+      # - `sort` sorts in byte order (hex hashes sort the same everywhere)
+      # This ensures the file content is identical regardless of OS or locale
+      - name: Git Create LFS id list
+        shell: bash
+        run: git lfs ls-files -l | awk '{print $1}' | sort > .lfs-assets-id
+
+      - name: Git Expose LFS cache key
+        id: expose-key
+        shell: bash
+        env:
+          LFS_KEY: lfs-${{ hashFiles('.lfs-assets-id') }}-v1
+        run: echo "lfs_key=$LFS_KEY" >> "$GITHUB_OUTPUT"
+
+      - name: Git Setup LFS Cache
+        uses: actions/cache@v5
+        with:
+          path: .git/lfs
+          key: ${{ steps.expose-key.outputs.lfs_key }}
+
+      - name: Git Pull LFS
+        shell: bash
+        run: git lfs pull
+
   Build:
+    needs: WarmLFS
     strategy:
       matrix:
-        isARM:
-          - ${{ contains(github.event.pull_request.labels.*.name, 'arch:arm32') || contains(github.event.pull_request.labels.*.name, 'arch:arm64') }}
         options:
           - os: ubuntu-latest
             framework: net7.0
             sdk: 7.0.x
             sdk-preview: true
             runtime: -x64
             codecov: false
-          - os: macos-13 # macos-latest runs on arm64 runners where libgdiplus is unavailable
+          - os: macos-26
             framework: net7.0
             sdk: 7.0.x
             sdk-preview: true
@@ -37,18 +81,19 @@ jobs:
             sdk-preview: true
             runtime: -x64
             codecov: false
-          - os: buildjet-4vcpu-ubuntu-2204-arm
+          - os: ubuntu-22.04-arm
             framework: net7.0
             sdk: 7.0.x
             sdk-preview: true
             runtime: -x64
             codecov: false
+
           - os: ubuntu-latest
             framework: net6.0
             sdk: 6.0.x
             runtime: -x64
             codecov: false
-          - os: macos-13 # macos-latest runs on arm64 runners where libgdiplus is unavailable
+          - os: macos-26
             framework: net6.0
             sdk: 6.0.x
             runtime: -x64
@@ -58,19 +103,32 @@ jobs:
             sdk: 6.0.x
             runtime: -x64
             codecov: false
-        exclude:
-          - isARM: false
-            options:
-              os: buildjet-4vcpu-ubuntu-2204-arm
+          - os: ubuntu-22.04-arm
+            framework: net6.0
+            sdk: 6.0.x
+            runtime: -x64
+            codecov: false
 
-    runs-on: ${{matrix.options.os}}
+    runs-on: ${{ matrix.options.os }}
 
     steps:
       - name: Install libgdi+, which is required for tests running on ubuntu
         if: ${{ contains(matrix.options.os, 'ubuntu') }}
         run: |
-            sudo apt-get update
-            sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
+          sudo apt-get update
+          sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
+
+      - name: Install libgdi+, which is required for tests running on macos
+        if: ${{ contains(matrix.options.os, 'macos-26') }}
+        run: |
+          brew update
+          brew install mono-libgdiplus
+          # Create symlinks to make libgdiplus discoverable
+          sudo mkdir -p /usr/local/lib
+          sudo ln -sf $(brew --prefix)/lib/libgdiplus.dylib /usr/local/lib/libgdiplus.dylib
+          # Verify installation
+          ls -la $(brew --prefix)/lib/libgdiplus* || echo "libgdiplus not found in brew prefix"
+          ls -la /usr/local/lib/libgdiplus* || echo "libgdiplus not found in /usr/local/lib"
 
       - name: Git Config
         shell: bash
@@ -84,39 +142,42 @@ jobs:
           fetch-depth: 0
           submodules: recursive
 
-      # See https://github.com/actions/checkout/issues/165#issuecomment-657673315
-      - name: Git Create LFS FileList
-        run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
-
+      # Use the warmed key from WarmLFS. Do not recompute or recreate .lfs-assets-id here.
       - name: Git Setup LFS Cache
-        uses: actions/cache@v3
-        id: lfs-cache
+        uses: actions/cache@v5
         with:
           path: .git/lfs
-          key: ${{ runner.os }}-lfs-${{ hashFiles('.lfs-assets-id') }}-v1
+          key: ${{ needs.WarmLFS.outputs.lfs_key }}
 
       - name: Git Pull LFS
+        shell: bash
         run: git lfs pull
 
       - name: NuGet Install
-        uses: NuGet/setup-nuget@v1
+        uses: NuGet/setup-nuget@v2
 
       - name: NuGet Setup Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         id: nuget-cache
         with:
           path: ~/.nuget
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/*.props', '**/*.targets') }}
           restore-keys: ${{ runner.os }}-nuget-
 
       - name: DotNet Setup
-        uses: actions/setup-dotnet@v4
+        if: ${{ matrix.options.sdk-preview != true }}
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: |
-            8.0.x
-            7.0.x
             6.0.x
 
+      - name: DotNet Setup Preview
+        if: ${{ matrix.options.sdk-preview == true }}
+        uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: |
+            7.0.x
+
       - name: DotNet Build
         if: ${{ matrix.options.sdk-preview != true }}
         shell: pwsh
@@ -148,19 +209,16 @@ jobs:
           XUNIT_PATH: .\tests\ImageSharp.Tests # Required for xunit
 
       - name: Export Failed Output
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         if: failure()
         with:
           name: actual_output_${{ runner.os }}_${{ matrix.options.framework }}${{ matrix.options.runtime }}.zip
           path: tests/Images/ActualOutput/
 
   Publish:
     needs: [Build]
-
     runs-on: ubuntu-latest
-
     if: (github.event_name == 'push')
-
     steps:
       - name: Git Config
         shell: bash
@@ -175,10 +233,10 @@ jobs:
           submodules: recursive
 
       - name: NuGet Install
-        uses: NuGet/setup-nuget@v1
+        uses: NuGet/setup-nuget@v2
 
       - name: NuGet Setup Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         id: nuget-cache
         with:
           path: ~/.nuget
@@ -201,4 +259,3 @@ jobs:
         run: |
           dotnet nuget push .\artifacts\*.nupkg -k ${{secrets.NUGET_TOKEN}} -s https://api.nuget.org/v3/index.json --skip-duplicate
           dotnet nuget push .\artifacts\*.snupkg -k ${{secrets.NUGET_TOKEN}} -s https://api.nuget.org/v3/index.json --skip-duplicate
-