diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 34992d0b4d5..6b7a9a3cece 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,8 +32,19 @@ jobs:
         os: ['macos-latest', 'windows-latest', 'ubuntu-latest']
     runs-on: ${{ matrix.os }}
     steps:
+<<<<<<< HEAD
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
+=======
+      - uses: actions/checkout@v4
+      - uses: antontroshin/setup-go@bda02de8887c9946189f81e7e59512914aeb9ea4
+        if: runner.os == 'Windows'
+        with:
+          go-version-file: go.mod
+          cache: true
+      - uses: actions/setup-go@v5
+        if: runner.os != 'Windows'
+>>>>>>> 211ccc86 (ci: switch to custom setup-go action in windows (#15623))
         with:
           go-version-file: .go-version
           cache: true