From 9be5af55fcc73bcebd18ec16783aa887a747cca4 Mon Sep 17 00:00:00 2001 From: Jesse Peterson Date: Tue, 8 Oct 2024 11:57:51 -0700 Subject: [PATCH] use Go 1.21 for workflows and docker; name workflows --- .github/workflows/on-push-pr.yml | 7 ++++--- .github/workflows/on-release.yml | 3 ++- Dockerfile.buildx | 2 +- README.md | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/on-push-pr.yml b/.github/workflows/on-push-pr.yml index bdb5a62..c0a0907 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 33b3c8a..66f894f 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 ab6eee7..54088ce 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # NanoMDM -[![Go](https://github.com/micromdm/nanomdm/workflows/Go/badge.svg)](https://github.com/micromdm/nanomdm/actions) +[![CD/CD](https://github.com/micromdm/nanomdm/workflows/CI%2FCD/badge.svg)](https://github.com/micromdm/nanomdm/actions) [![Go Reference](https://pkg.go.dev/badge/github.com/micromdm/nanomdm.svg)](https://pkg.go.dev/github.com/micromdm/nanomdm) -NanoMDM is a minimalist [Apple MDM server](https://developer.apple.com/documentation/devicemanagement) heavily inspired by [MicroMDM](https://github.com/micromdm/micromdm). +NanoMDM is a minimalist [Apple MDM](https://developer.apple.com/documentation/devicemanagement) server and library heavily inspired by [MicroMDM](https://github.com/micromdm/micromdm). ## Getting started & Documentation