From 0be1e5a73dc0d987848ff32592c569d34e7b2024 Mon Sep 17 00:00:00 2001
From: Pedro Kaj Kjellerup Nacht <pnacht@google.com>
Date: Mon, 19 Jun 2023 20:49:38 +0000
Subject: [PATCH] Use meson 0.62.0, remove retry

Signed-off-by: Pedro Kaj Kjellerup Nacht <pnacht@google.com>
---
 .ci/requirements.in           |  2 +-
 .ci/requirements.txt          |  6 +++---
 .github/workflows/msvc-ci.yml | 33 +++++++--------------------------
 3 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/.ci/requirements.in b/.ci/requirements.in
index 032980ba6..1b4faf237 100644
--- a/.ci/requirements.in
+++ b/.ci/requirements.in
@@ -1,4 +1,4 @@
 -r requirements-fonttools.in
-meson==0.60.0
+meson==0.62.0
 gcovr==5.0
 ninja
diff --git a/.ci/requirements.txt b/.ci/requirements.txt
index 86af16391..ed751332b 100644
--- a/.ci/requirements.txt
+++ b/.ci/requirements.txt
@@ -179,9 +179,9 @@ markupsafe==2.1.3 \
     --hash=sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc \
     --hash=sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2
     # via jinja2
-meson==0.60.0 \
-    --hash=sha256:080d68b685e9a0d9c9bb475457e097b49e1d1a6f750abc971428a8d2e1b12d47 \
-    --hash=sha256:40cc2426b482c8b0d7931a2ed69aaf85caf1ae7653d0435e82e39c5867cfa28c
+meson==0.62.0 \
+    --hash=sha256:00e06dccac7d3b0568b5da82e70c2028c80c359aab6dc517bcbd1825511898c3 \
+    --hash=sha256:06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb
     # via -r .ci/requirements.in
 ninja==1.11.1 \
     --hash=sha256:1c474326e11fba3f8c2582715d79216292e327d3335367c0e87e9647a002cc4a \
diff --git a/.github/workflows/msvc-ci.yml b/.github/workflows/msvc-ci.yml
index 2bc177131..a66e5d0e0 100644
--- a/.github/workflows/msvc-ci.yml
+++ b/.github/workflows/msvc-ci.yml
@@ -48,32 +48,13 @@ jobs:
     - name: Setup Meson
       run: |
           sccache --version
-
-          # For Windows, meson downloads source tarballs.
-          # The endpoint is flaky, so we need to wrap this in a retry loop.
-          # (meson handles this internally as of 0.62.0)
-          $attempts=1
-          $timeout=1
-          while ($attempts -le 5 )
-          {
-            meson setup build `
-              --wrap-mode=forcefallback `
-              --buildtype=release `
-              -Dglib=enabled `
-              -Dfreetype=enabled `
-              -Dgdi=enabled `
-              -Ddirectwrite=enabled
-
-            if ($LASTEXITCODE -eq 0)
-            {
-              break
-            }
-
-            echo "Setup failed, trying again with delay"
-            Start-Sleep -Seconds $timeout
-            $timeout=$timeout * 2
-            $attempts++
-          }
+          meson setup build `
+            --wrap-mode=forcefallback `
+            --buildtype=release `
+            -Dglib=enabled `
+            -Dfreetype=enabled `
+            -Dgdi=enabled `
+            -Ddirectwrite=enabled
     - name: Build
       run: meson compile -Cbuild
     - name: Test