From 58f38852a1d03b9a7dc34ca56ab6d548d8eb7f68 Mon Sep 17 00:00:00 2001
From: Jesse Peterson <jesse.c.peterson@gmail.com>
Date: Tue, 8 Oct 2024 10:59:05 -0700
Subject: [PATCH] use Go 1.21 for workflows and docker; name workflows

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

diff --git a/.github/workflows/on-push-pr.yml b/.github/workflows/on-push-pr.yml
index 7fd84c6..bfdcdf9 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]
@@ -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 f6c66d6..8b24eeb 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 ec31539..b9e130a 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 4cef236..4081e7e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # NanoDEP
 
-[![Go](https://github.com/micromdm/nanodep/workflows/Go/badge.svg)](https://github.com/micromdm/nanodep/actions) [![Go Reference](https://pkg.go.dev/badge/github.com/micromdm/nanodep.svg)](https://pkg.go.dev/github.com/micromdm/nanodep)
+[![Go](https://github.com/micromdm/nanodep/workflows/CI%2FCD/badge.svg)](https://github.com/micromdm/nanodep/actions) [![Go Reference](https://pkg.go.dev/badge/github.com/micromdm/nanodep.svg)](https://pkg.go.dev/github.com/micromdm/nanodep)
 
 NanoDEP is a set of tools and a Go library powering them for communicating with Apple's Device Enrollment Program (DEP) API servers.