From ae3e423905666c7ea74fdad20ccd731e7016842c Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyle@sqlc.dev>
Date: Mon, 20 Jan 2025 09:35:02 -0800
Subject: [PATCH 1/3] build: Re-enable Windows builds

---
 .github/workflows/ci.yml | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 149cb9a23f..be04378324 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,20 +9,19 @@ jobs:
     strategy:
       matrix:
         # Disabling windows builds while we figure out why they're broken
-        # os: [ubuntu-latest, macos-latest, windows-latest]
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-22.04, macos-14, windows-2022]
         cgo: ['1', '0']
         # Workaround no native support for conditional matrix items
         # https://github.com/orgs/community/discussions/26253#discussioncomment-6745038
-        isMain:
-          - ${{ github.ref == 'refs/heads/main' }}
-        exclude:
-          - isMain: false
-        include:
-        - os: ubuntu-latest
-          cgo: '1'
-        - os: ubuntu-latest
-          cgo: '0'
+        # isMain:
+        #   - ${{ github.ref == 'refs/heads/main' }}
+        # exclude:
+        #   - isMain: false
+        # include:
+        # - os: ubuntu-22.04
+        #   cgo: '1'
+        # - os: ubuntu-22.04
+        #   cgo: '0'
     name: test ${{ matrix.os }} cgo=${{ matrix.cgo }}
     runs-on: ${{ matrix.os }}
 
@@ -71,7 +70,7 @@ jobs:
         CGO_ENABLED: ${{ matrix.cgo }}
 
   vuln_check:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     timeout-minutes: 5
 
     steps:

From 72caf50ccf8a9f7d7d34c2abc5dcbbc653bd9219 Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyle@sqlc.dev>
Date: Mon, 20 Jan 2025 09:38:30 -0800
Subject: [PATCH 2/3] Upgrade to Go 1.23.5

---
 .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 be04378324..bf94fc176f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v5
       with:
-        go-version: '1.22.8'
+        go-version: '1.23.5'
 
     - name: install gotestsum
       run: go install gotest.tools/gotestsum@latest
@@ -77,6 +77,6 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v5
       with:
-        go-version: '1.22.8'
+        go-version: '1.23.5'
     - run: go install golang.org/x/vuln/cmd/govulncheck@latest
     - run: govulncheck ./...

From ac2d365f47514e88db4fa43ff820a2423132c491 Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyle@sqlc.dev>
Date: Mon, 20 Jan 2025 09:53:57 -0800
Subject: [PATCH 3/3] Re-disable Windows

---
 .github/workflows/ci.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bf94fc176f..8aec33c8e0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,20 +8,21 @@ jobs:
   test:
     strategy:
       matrix:
-        # Disabling windows builds while we figure out why they're broken
-        os: [ubuntu-22.04, macos-14, windows-2022]
+        # Disabling windows builds while we fix installing PostgreSQL 16
+        # os: [ubuntu-22.04, macos-14, windows-2022]
+        os: [ubuntu-22.04, macos-14]
         cgo: ['1', '0']
         # Workaround no native support for conditional matrix items
         # https://github.com/orgs/community/discussions/26253#discussioncomment-6745038
-        # isMain:
-        #   - ${{ github.ref == 'refs/heads/main' }}
-        # exclude:
-        #   - isMain: false
-        # include:
-        # - os: ubuntu-22.04
-        #   cgo: '1'
-        # - os: ubuntu-22.04
-        #   cgo: '0'
+        isMain:
+          - ${{ github.ref == 'refs/heads/main' }}
+        exclude:
+          - isMain: false
+        include:
+        - os: ubuntu-22.04
+          cgo: '1'
+        - os: ubuntu-22.04
+          cgo: '0'
     name: test ${{ matrix.os }} cgo=${{ matrix.cgo }}
     runs-on: ${{ matrix.os }}