From 5ac115f187fcbfc885f9d52950536ddc00415ce2 Mon Sep 17 00:00:00 2001
From: Chris Povirk <cpovirk@google.com>
Date: Thu, 8 Jun 2023 10:42:28 -0400
Subject: [PATCH 1/3] Try to test Windows CI.

DO NOT SUBMIT

Fixes https://github.com/google/guava/issues/2686 if we submit it, which
we won't.
---
 .github/workflows/ci.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3f754437caf7..5db77f3abed0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,9 +19,14 @@ jobs:
     name: "${{ matrix.root-pom }} on JDK ${{ matrix.java }}"
     strategy:
       matrix:
+        os: [ ubuntu-latest ]
         java: [ 8, 11, 17 ]
         root-pom: [ 'pom.xml', 'android/pom.xml' ]
-    runs-on: ubuntu-latest
+        include:
+          - os: windows-latest
+          - java: 17
+          - root-pom: pom.xml
+    runs-on: ${{ matrix.os }}
     env:
       ROOT_POM: ${{ matrix.root-pom }}
     steps:

From 9f71122d96522ee3ec6d83167db1e5e8384ca7cb Mon Sep 17 00:00:00 2001
From: Chris Povirk <cpovirk@google.com>
Date: Thu, 8 Jun 2023 10:44:36 -0400
Subject: [PATCH 2/3] Include OS in job name.

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5db77f3abed0..90ed01ad15c6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     permissions:
       actions: write  # for styfle/cancel-workflow-action to cancel/stop running workflows
       contents: read  # for actions/checkout to fetch code
-    name: "${{ matrix.root-pom }} on JDK ${{ matrix.java }}"
+    name: "${{ matrix.root-pom }} on JDK ${{ matrix.java }} on ${{ matrix.os }}"
     strategy:
       matrix:
         os: [ ubuntu-latest ]

From e22061c0b88adf6c6f59924f4994c85f8f0d9893 Mon Sep 17 00:00:00 2001
From: Chris Povirk <cpovirk@google.com>
Date: Thu, 8 Jun 2023 10:46:40 -0400
Subject: [PATCH 3/3] yaml :(

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 90ed01ad15c6..485a3d403e14 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,8 +24,8 @@ jobs:
         root-pom: [ 'pom.xml', 'android/pom.xml' ]
         include:
           - os: windows-latest
-          - java: 17
-          - root-pom: pom.xml
+            java: 17
+            root-pom: pom.xml
     runs-on: ${{ matrix.os }}
     env:
       ROOT_POM: ${{ matrix.root-pom }}