Merge pull request #9938 from akhilerm/cherry-pick-9777-1.7

mxpv · web-flow · commit 4c825b37430d · 2024-03-07T08:57:10.000-08:00
[release/1.7] Move inline PS scripts into files
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -249,57 +249,12 @@ jobs:
       - name: Upgrade Chocolaty on Windows 2019
         if: matrix.os == 'windows-2019'
         shell: powershell
-        run: |
-          Write-Output '::group::Update chocolaty'
-          choco upgrade -y chocolatey
-          Write-Output '::endgroup::'
-
-          if ( $LASTEXITCODE ) {
-            Write-Output '::error::Could not update chocolatey.'
-            exit $LASTEXITCODE
-          }
+        run: .\script\setup\upgrade_chocolaty_windows_2019.ps1
 
       - name: Upgrade MinGW on Windows 2019
         if: matrix.os == 'windows-2019'
         shell: powershell
-        run: |
-          # Add retry and backoff
-          foreach ( $i in 1..3 ) {
-            Write-Output "::group::Attempt $i"
-            if ( $i -gt 1 ) {
-              # remove any left-over state
-              choco uninstall -y --no-progress --force mingw
-
-              Write-Output 'Sleeping for 60 seconds'
-              Sleep -Seconds 60
-            }
-
-            Write-Output 'manually force remove C:\mingw64'
-            Remove-Item -Path "C:\mingw64" -Recurse -Force -ErrorAction Ignore
-
-            choco install -y --no-progress --stop-on-first-failure --force mingw --allow-downgrade --version 12.2.0.3042023
-            Write-Output '::endgroup::'
-            if ( -not $LASTEXITCODE ) {
-              Write-Output "Attempt $i succeeded (exit code: $LASTEXITCODE)"
-              break
-            }
-            Write-Output "::warning title=mingw::Attempt $i failed (exit code: $LASTEXITCODE)"
-          }
-
-          if ( $LASTEXITCODE ) {
-            Write-Output "::error::Could not install mingw after $i attempts."
-            exit $LASTEXITCODE
-          }
-
-          # Copy to default path
-          Copy-Item -Path "C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64" -Destination "C:\mingw64" -Recurse -Force
-
-          # Copy as make.exe
-          $path = "C:\mingw64\bin\mingw32-make.exe" | Get-Item
-          Copy-Item -Path $path.FullName -Destination (Join-Path $path.Directory.FullName 'make.exe') -Force
-
-          # verify mingw32-make was installed
-          Get-Command -CommandType Application -ErrorAction Stop mingw32-make.exe
+        run: .\script\setup\upgrade_mingw_windows_2019.ps1
 
       - name: Binaries
         shell: bash
diff --git a/script/setup/upgrade_chocolaty_windows_2019.ps1 b/script/setup/upgrade_chocolaty_windows_2019.ps1
@@ -0,0 +1,8 @@
+Write-Output '::group::Update chocolaty'
+choco upgrade -y chocolatey
+Write-Output '::endgroup::'
+
+if ( $LASTEXITCODE ) {
+    Write-Output '::error::Could not update chocolatey.'
+    exit $LASTEXITCODE
+}
diff --git a/script/setup/upgrade_mingw_windows_2019.ps1 b/script/setup/upgrade_mingw_windows_2019.ps1
@@ -0,0 +1,38 @@
+# Add retry and backoff
+foreach ( $i in 1..3 ) {
+    Write-Output "::group::Attempt $i"
+    if ( $i -gt 1 ) {
+        # remove any left-over state
+        choco uninstall -y --no-progress --force mingw
+
+        Write-Output 'Sleeping for 60 seconds'
+        Sleep -Seconds 60
+    }
+
+    Write-Output 'manually force remove C:\mingw64'
+    Remove-Item -Path "C:\mingw64" -Recurse -Force -ErrorAction Ignore
+
+    choco install -y --no-progress --stop-on-first-failure --force mingw --allow-downgrade --version 12.2.0.3042023
+    Write-Output '::endgroup::'
+    if ( -not $LASTEXITCODE ) {
+        Write-Output "Attempt $i succeeded (exit code: $LASTEXITCODE)"
+        break
+    }
+
+    Write-Output "::warning title=mingw::Attempt $i failed (exit code: $LASTEXITCODE)"
+}
+
+if ( $LASTEXITCODE ) {
+    Write-Output "::error::Could not install mingw after $i attempts."
+    exit $LASTEXITCODE
+}
+
+# Copy to default path
+Copy-Item -Path "C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64" -Destination "C:\mingw64" -Recurse -Force
+
+# Copy as make.exe
+$path = "C:\mingw64\bin\mingw32-make.exe" | Get-Item
+Copy-Item -Path $path.FullName -Destination (Join-Path $path.Directory.FullName 'make.exe') -Force
+
+# verify mingw32-make was installed
+Get-Command -CommandType Application -ErrorAction Stop mingw32-make.exe
