Skip to content

Commit

Permalink
Update to Go 1.22
Browse files Browse the repository at this point in the history
  • Loading branch information
rick-a-lane-ii committed Jun 25, 2024
1 parent ec921e4 commit 34a0e68
Show file tree
Hide file tree
Showing 11 changed files with 10 additions and 1,180 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ DEPENDENCY_LICENSES.md
.git
.github
actions
tools
8 changes: 6 additions & 2 deletions .github/workflows/qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
- '1.19.0'
- '1.20.0'
- '1.21.0'
- '1.22.0'
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
Expand All @@ -25,7 +26,7 @@ jobs:
if [[ "${{runner.debug}}" == "1" ]]; then
DEBUG_FLAGS="-v"
fi
go test -race ${DEBUG_FLAGS} ./...
lint:
runs-on: ubuntu-latest
Expand All @@ -36,7 +37,10 @@ jobs:
# Specify the most recent (1.Y.Z) Y release
go-version-file: go.mod
cache: true
- run: make lint
- uses: golangci/golangci-lint-action@v5
with:
version: latest
args: --timeout=10m
generate:
runs-on: ubuntu-latest
steps:
Expand Down
7 changes: 0 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@ generate:
go generate ./...
.PHONY: generate

lint: tools/bin/golangci-lint
tools/bin/golangci-lint run ./...
.PHONY: lint

tools/bin/%: tools/src/%/pin.go tools/src/%/go.mod
cd $(<D) && GOOS= GOARCH= go build -o $(abspath $@) $$(sed -En 's,^import "(.*)".*,\1,p' pin.go)

.DELETE_ON_ERROR:
.PHONY: FORCE
FORCE:
2 changes: 1 addition & 1 deletion build-aux/docker/go_builder.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Go dependency scanner
########################################
ARG GO_IMAGE="base-image-unknown"
FROM golang:1.20.12-alpine3.19 as builder
FROM golang:1.22.4-alpine3.20 as builder

ENV GOCACHE=/root/.cache/go-build
RUN mkdir -p "${GOCACHE}"
Expand Down
2 changes: 1 addition & 1 deletion build-aux/docker/js_builder.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# builder for Js scanning
######################################################################
ARG NODE_IMAGE="need-a-base-image"
FROM golang:1.19-alpine3.15 as builder
FROM golang:1.22.4-alpine3.20 as builder

ENV GOCACHE=/root/.cache/go-build
RUN mkdir -p "${GOCACHE}"
Expand Down
2 changes: 1 addition & 1 deletion build-aux/docker/py_builder.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Python dependency scanner
########################################
ARG PYTHON_IMAGE="need-a-base-image"
FROM golang:1.19-alpine3.15 as builder
FROM golang:1.22.4-alpine3.20 as builder

WORKDIR /src
COPY . ./
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/datawire/go-mkopensource

go 1.21
go 1.22

require (
github.com/datawire/dlib v1.3.1
Expand Down
1 change: 0 additions & 1 deletion tools/.gitignore

This file was deleted.

183 changes: 0 additions & 183 deletions tools/src/golangci-lint/go.mod

This file was deleted.

Loading

0 comments on commit 34a0e68

Please sign in to comment.