Skip to content

Commit 34a0e68

Browse files
Update to Go 1.22
1 parent ec921e4 commit 34a0e68

File tree

11 files changed

+10
-1180
lines changed

11 files changed

+10
-1180
lines changed

.dockerignore

-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ DEPENDENCY_LICENSES.md
77
.git
88
.github
99
actions
10-
tools

.github/workflows/qa.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
- '1.19.0'
1616
- '1.20.0'
1717
- '1.21.0'
18+
- '1.22.0'
1819
steps:
1920
- uses: actions/checkout@v3
2021
- uses: actions/setup-go@v3
@@ -25,7 +26,7 @@ jobs:
2526
if [[ "${{runner.debug}}" == "1" ]]; then
2627
DEBUG_FLAGS="-v"
2728
fi
28-
29+
2930
go test -race ${DEBUG_FLAGS} ./...
3031
lint:
3132
runs-on: ubuntu-latest
@@ -36,7 +37,10 @@ jobs:
3637
# Specify the most recent (1.Y.Z) Y release
3738
go-version-file: go.mod
3839
cache: true
39-
- run: make lint
40+
- uses: golangci/golangci-lint-action@v5
41+
with:
42+
version: latest
43+
args: --timeout=10m
4044
generate:
4145
runs-on: ubuntu-latest
4246
steps:

Makefile

-7
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,6 @@ generate:
1313
go generate ./...
1414
.PHONY: generate
1515

16-
lint: tools/bin/golangci-lint
17-
tools/bin/golangci-lint run ./...
18-
.PHONY: lint
19-
20-
tools/bin/%: tools/src/%/pin.go tools/src/%/go.mod
21-
cd $(<D) && GOOS= GOARCH= go build -o $(abspath $@) $$(sed -En 's,^import "(.*)".*,\1,p' pin.go)
22-
2316
.DELETE_ON_ERROR:
2417
.PHONY: FORCE
2518
FORCE:

build-aux/docker/go_builder.dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Go dependency scanner
33
########################################
44
ARG GO_IMAGE="base-image-unknown"
5-
FROM golang:1.20.12-alpine3.19 as builder
5+
FROM golang:1.22.4-alpine3.20 as builder
66

77
ENV GOCACHE=/root/.cache/go-build
88
RUN mkdir -p "${GOCACHE}"

build-aux/docker/js_builder.dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# builder for Js scanning
33
######################################################################
44
ARG NODE_IMAGE="need-a-base-image"
5-
FROM golang:1.19-alpine3.15 as builder
5+
FROM golang:1.22.4-alpine3.20 as builder
66

77
ENV GOCACHE=/root/.cache/go-build
88
RUN mkdir -p "${GOCACHE}"

build-aux/docker/py_builder.dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Python dependency scanner
33
########################################
44
ARG PYTHON_IMAGE="need-a-base-image"
5-
FROM golang:1.19-alpine3.15 as builder
5+
FROM golang:1.22.4-alpine3.20 as builder
66

77
WORKDIR /src
88
COPY . ./

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/datawire/go-mkopensource
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/datawire/dlib v1.3.1

tools/.gitignore

-1
This file was deleted.

tools/src/golangci-lint/go.mod

-183
This file was deleted.

0 commit comments

Comments
 (0)