Merge pull request #1936 from microsoft/milestones/m273

Release M273

Author: mjcheetham

.github/workflows/build.yaml

@@ -1,5 +1,7 @@
 name: VFS for Git
 
+run-name: ${{ inputs.run_name || 'VFS for Git' }}
+
 on:
   pull_request:
     branches: [ master, releases/shipped ]
@@ -11,12 +13,17 @@ on:
         description: 'Microsoft Git version tag to include in the build (leave empty for default)'
         required: false
         type: string
+      run_name:
+        description: 'Optional display name for this run (used for cross-repo automation)'
+        required: false
+        type: string
 
 permissions:
   contents: read
+  actions: read
 
 env:
-  GIT_VERSION: ${{ github.event.inputs.git_version || 'v2.50.1.vfs.0.1' }}
+  GIT_VERSION: ${{ github.event.inputs.git_version || 'v2.53.0.vfs.0.6' }}
 
 jobs:
   validate:
@@ -93,7 +100,10 @@ jobs:
                 }
               }
 
-              if (run.status === 'completed' && run.conclusion === 'success') return run.html_url
+              if (run.status === 'completed' && run.conclusion === 'success') {
+                core.notice(`Skipping: There already is a successful run: ${run.html_url}`)
+                return run.html_url
+              }
             }
             return ''
           } catch (e) {
@@ -116,6 +126,48 @@ jobs:
           -Tag $env:GIT_VERSION && `
         Write-Host ::notice title=Validation::Using microsoft/git version $env:GIT_VERSION
 
+    - name: Download microsoft/git installers
+      if: steps.check.outputs.result == ''
+      shell: cmd
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        gh release download %GIT_VERSION% --repo microsoft/git --pattern "Git*.exe" --dir MicrosoftGit
+
+    - name: Create Git install script
+      if: steps.check.outputs.result == ''
+      shell: cmd
+      run: |
+        >MicrosoftGit\install.bat (
+          echo @ECHO OFF
+          echo SETLOCAL
+          echo.
+          echo IF "%%PROCESSOR_ARCHITECTURE%%"=="AMD64" ^(
+          echo     SET GIT_ARCH=64-bit
+          echo ^) ELSE IF "%%PROCESSOR_ARCHITECTURE%%"=="ARM64" ^(
+          echo     SET GIT_ARCH=arm64
+          echo ^) ELSE ^(
+          echo     ECHO Unknown architecture: %%PROCESSOR_ARCHITECTURE%%
+          echo     exit 1
+          echo ^)
+          echo.
+          echo FOR /F "tokens=* USEBACKQ" %%%%F IN ^( `where /R %%~dp0 Git*-%%GIT_ARCH%%.exe` ^) DO SET GIT_INSTALLER=%%%%F
+          echo.
+          echo SET LOGDIR=%%~dp0\logs
+          echo IF EXIST %%LOGDIR%% ^( rmdir /S /Q %%LOGDIR%% ^)
+          echo mkdir %%LOGDIR%%
+          echo.
+          echo ECHO Installing Git ^(%%GIT_ARCH%%^)...
+          echo %%GIT_INSTALLER%% /LOG="%%LOGDIR%%\git.log" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /ALLOWDOWNGRADE=1
+        )
+
+    - name: Upload microsoft/git installers
+      if: steps.check.outputs.result == ''
+      uses: actions/upload-artifact@v7
+      with:
+        name: MicrosoftGit
+        path: MicrosoftGit
+
   build:
     runs-on: windows-2025
     name: Build and Unit Test
@@ -150,7 +202,7 @@ jobs:
 
     - name: Add MSBuild to PATH
       if: steps.skip.outputs.result != 'true'
-      uses: microsoft/setup-msbuild@v2.0.0
+      uses: microsoft/setup-msbuild@v3.0.0
 
     - name: Build VFS for Git
       if: steps.skip.outputs.result != 'true'
@@ -167,139 +219,39 @@ jobs:
       shell: cmd
       run: src\scripts\CreateBuildArtifacts.bat ${{ matrix.configuration }} artifacts
 
-    - name: Download microsoft/git installers
-      if: steps.skip.outputs.result != 'true'
-      shell: cmd
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        gh release download %GIT_VERSION% --repo microsoft/git --pattern "Git*.exe" --dir artifacts\GVFS.Installers
-
     - name: Upload functional tests drop
       if: steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: FunctionalTests_${{ matrix.configuration }}
         path: artifacts\GVFS.FunctionalTests
 
     - name: Upload FastFetch drop
       if: steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: FastFetch_${{ matrix.configuration }}
         path: artifacts\FastFetch
 
-    - name: Upload installers
+    - name: Upload GVFS installer
       if: steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
-        name: Installers_${{ matrix.configuration }}
+        name: GVFS_${{ matrix.configuration }}
         path: artifacts\GVFS.Installers
 
-  functional_test:
-    runs-on: ${{ matrix.architecture == 'arm64' && 'windows-11-arm' || 'windows-2025' }}
+  functional_tests:
     name: Functional Tests
     needs: [validate, build]
-
-    strategy:
-      matrix:
-        configuration: [ Debug, Release ]
-        architecture: [ x86_64, arm64 ]
-        nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] # 10 parallel jobs to speed up the tests
-      fail-fast: false # most failures are flaky tests, no need to stop the other jobs from succeeding
-
-    steps:
-    - name: Skip this job if there is a previous successful run
-      if: needs.validate.outputs.skip != ''
-      id: skip
-      uses: actions/github-script@v8
-      with:
-        script: |
-          core.info(`Skipping: There already is a successful run: ${{ needs.validate.outputs.skip }}`)
-          return true
-
-    - name: Download installers
-      if: steps.skip.outputs.result != 'true'
-      uses: actions/download-artifact@v7
-      with:
-        name: Installers_${{ matrix.configuration }}
-        path: install
-
-    - name: Download functional tests drop
-      if: steps.skip.outputs.result != 'true'
-      uses: actions/download-artifact@v7
-      with:
-        name: FunctionalTests_${{ matrix.configuration }}
-        path: ft
-
-    - name: ProjFS details (pre-install)
-      if: steps.skip.outputs.result != 'true'
-      shell: cmd
-      run: install\info.bat
-
-    - name: Install product
-      if: steps.skip.outputs.result != 'true'
-      shell: cmd
-      run: install\install.bat
-
-    - name: ProjFS details (post-install)
-      if: steps.skip.outputs.result != 'true'
-      shell: cmd
-      run: install\info.bat
-
-    - name: Upload installation logs
-      if: always() && steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@v6
-      with:
-        name: InstallationLogs_${{ matrix.configuration }}_${{ matrix.architecture }}-${{ matrix.nr }}
-        path: install\logs
-
-    - name: Run functional tests
-      if: steps.skip.outputs.result != 'true'
-      shell: cmd
-      run: |
-        SET PATH=C:\Program Files\VFS for Git;%PATH%
-        SET GIT_TRACE2_PERF=C:\temp\git-trace2.log
-        ft\GVFS.FunctionalTests.exe /result:TestResult.xml --ci --slice=${{ matrix.nr }},10
-
-    - name: Upload functional test results
-      if: always() && steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@v6
-      with:
-        name: FunctionalTests_Results_${{ matrix.configuration }}_${{ matrix.architecture }}-${{ matrix.nr }}
-        path: TestResult.xml
-
-    - name: Upload Git trace2 output
-      if: always() && steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@v6
-      with:
-        name: GitTrace2_${{ matrix.configuration }}_${{ matrix.architecture }}-${{ matrix.nr }}
-        path: C:\temp\git-trace2.log
-
-    - name: ProjFS details (post-test)
-      if: always() && steps.skip.outputs.result != 'true'
-      shell: cmd
-      run: install\info.bat
-
-  ft_results:
-    runs-on: ubuntu-latest # quickest runners
-    name: Functional Tests
-    needs: [functional_test]
-
-    strategy:
-      matrix:
-        configuration: [ Debug, Release ]
-        architecture: [ x86_64, arm64 ]
-
-    steps:
-      - name: Success! # for easier identification of successful runs in the Checks Required for Pull Requests
-        run: echo "All functional test jobs successful for ${{ matrix.configuration }} / ${{ matrix.architecture }}!"
+    uses: ./.github/workflows/functional-tests.yaml
+    with:
+      skip: ${{ needs.validate.outputs.skip }}
 
   result:
     runs-on: ubuntu-latest
     name: Build, Unit and Functional Tests Successful
-    needs: [functional_test]
+    needs: [functional_tests]
 
     steps:
       - name: Success! # for easier identification of successful runs in the Checks Required for Pull Requests
-        run: echo "Workflow run is successful!"
+        run: echo "Workflow run is successful!"