From 63b7b55daaff916eef590e5384cad4a92fb23ea0 Mon Sep 17 00:00:00 2001
From: Jesse Peterson <jesse.c.peterson@gmail.com>
Date: Tue, 8 Oct 2024 10:54:17 -0700
Subject: [PATCH] use Go 1.21 for workflows (incl. docker); name workflows

---
 .github/workflows/on-push-pr.yml | 7 ++++---
 .github/workflows/on-release.yml | 3 ++-
 Dockerfile.buildx                | 2 +-
 README.md                        | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/on-push-pr.yml b/.github/workflows/on-push-pr.yml
index 271fdf7..70749f2 100644
--- a/.github/workflows/on-push-pr.yml
+++ b/.github/workflows/on-push-pr.yml
@@ -1,3 +1,4 @@
+name: CI/CD
 on:
   push:
     branches: [main]
@@ -8,7 +9,7 @@ jobs:
   format-build-test:
     strategy:
       matrix:
-        go-version: ['1.19.x', '1.21.x']
+        go-version: ['1.21.x', '1.22.x']
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
@@ -75,7 +76,7 @@ jobs:
 
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32  # v5.0.2
         with:
-          go-version: '1.19.x'
+          go-version: '1.21.x'
 
       - run: CGO_ENABLED=0 make release
 
@@ -108,7 +109,7 @@ jobs:
 
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32  # v5.0.2
         with:
-          go-version: '1.19.x'
+          go-version: '1.21.x'
 
       - name: verify mysql
         run: |
diff --git a/.github/workflows/on-release.yml b/.github/workflows/on-release.yml
index 8694e0d..f24cc66 100644
--- a/.github/workflows/on-release.yml
+++ b/.github/workflows/on-release.yml
@@ -1,3 +1,4 @@
+name: Release
 on:
   release:
     types: [published]
@@ -13,7 +14,7 @@ jobs:
 
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32  # v5.0.2
         with:
-          go-version: '1.19.x'
+          go-version: '1.21.x'
 
       - run: CGO_ENABLED=0 make release
 
diff --git a/Dockerfile.buildx b/Dockerfile.buildx
index de26f90..211b381 100644
--- a/Dockerfile.buildx
+++ b/Dockerfile.buildx
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.19 AS builder
+FROM --platform=$BUILDPLATFORM golang:1.21 AS builder
 
 WORKDIR /go/app
 
diff --git a/README.md b/README.md
index bf63d00..4880ed0 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # NanoCMD
 
-[![Go](https://github.com/micromdm/nanocmd/workflows/Go/badge.svg)](https://github.com/micromdm/nanocmd/actions)
+[![CI/CD](https://github.com/micromdm/nanocmd/workflows/CI%2FCD/badge.svg)](https://github.com/micromdm/nanocmd/actions)
 
 NanoCMD is a modular Go library and reference server for abstracting Apple MDM commands and responses into a concept of workflows.