From 40ef5ada0c64c701996a3670462fdf8c7bb3ac99 Mon Sep 17 00:00:00 2001
From: Bjorn Tipling <bjorn.tipling@conductorone.com>
Date: Sun, 4 May 2025 11:13:50 -0700
Subject: [PATCH 1/3] fix ci

---
 .github/workflows/ci.yaml | 6 +++---
 go.mod                    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e42422a3..c2f9352c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -7,7 +7,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23.x
+          go-version: 1.24.x
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Run linters
@@ -18,7 +18,7 @@ jobs:
   go-test:
     strategy:
       matrix:
-        go-version: [1.23.x]
+        go-version: [1.24.x]
         platform: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
@@ -51,7 +51,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23.x
+          go-version: 1.24.x
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Run Docker Compose as a Daemon (to start sql server)
diff --git a/go.mod b/go.mod
index 8f8dc195..27de4397 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/conductorone/baton-sql-server
 
-go 1.23.4
+go 1.24.1
 
 require (
 	github.com/conductorone/baton-sdk v0.2.98

From 52fe71336e8a65deeed80d0f708eb94f84189e75 Mon Sep 17 00:00:00 2001
From: Bjorn Tipling <bjorn.tipling@conductorone.com>
Date: Sun, 4 May 2025 11:20:46 -0700
Subject: [PATCH 2/3] more updates to 1.24

---
 .github/workflows/main.yaml    |  8 ++++----
 .github/workflows/release.yaml | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 179b8ef7..a248aa79 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -10,7 +10,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23.x
+          go-version: 1.24.x
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Run linters
@@ -21,8 +21,8 @@ jobs:
   go-test:
     strategy:
       matrix:
-        go-version: [ 1.23.x ]
-        platform: [ ubuntu-latest, windows-latest ]
+        go-version: [1.24.x]
+        platform: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Install Go
@@ -38,4 +38,4 @@ jobs:
         if: always()
         uses: guyarb/golang-test-annotations@v0.5.1
         with:
-          test-results: test.json
\ No newline at end of file
+          test-results: test.json
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index d3f44661..1d5b60de 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23.x
+          go-version: 1.24.x
       - name: Set up Gon
         run: brew tap conductorone/gon && brew install conductorone/gon/gon
       - name: Import Keychain Certs
@@ -27,7 +27,7 @@ jobs:
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v6
         with:
-          version: "~> v2"
+          version: '~> v2'
           args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }}
@@ -43,7 +43,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23.x
+          go-version: 1.24.x
       - name: Docker Login
         uses: docker/login-action@v1
         with:
@@ -55,7 +55,7 @@ jobs:
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v6
         with:
-          version: "~> v2"
+          version: '~> v2'
           args: release --clean -f .goreleaser.docker.yaml
         env:
-          GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }}
\ No newline at end of file
+          GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }}

From 40905d5d766481f3df000eccf1f990ba92d2a372 Mon Sep 17 00:00:00 2001
From: Bjorn Tipling <bjorn.tipling@conductorone.com>
Date: Sun, 4 May 2025 11:29:11 -0700
Subject: [PATCH 3/3] update go matrix to include go.12 as I don't know what
 customers are using

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

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c2f9352c..9dd32c3a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -18,7 +18,7 @@ jobs:
   go-test:
     strategy:
       matrix:
-        go-version: [1.24.x]
+        go-version: [1.22.x, 1.24.x]
         platform: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps: