Skip to content

Commit 4e65d78

Browse files
committed
Bumped Go version to 1.17 and frolvlad/alpine-glibc
1 parent b904e5b commit 4e65d78

File tree

5 files changed

+36
-15
lines changed

5 files changed

+36
-15
lines changed

Diff for: .github/workflows/ci.yml

+23-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,30 @@ on:
66
pull_request:
77
branches: [ master ]
88

9+
env:
10+
GOLANG_VERSION: 1.17
11+
912
jobs:
13+
build_docker:
14+
name: Build Docker
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout
18+
uses: actions/[email protected]
19+
20+
- name: Set up Docker Buildx
21+
uses: docker/[email protected]
22+
23+
- name: Do Local Test Build
24+
uses: docker/[email protected]
25+
with:
26+
load: true
27+
tags: test
28+
context: .
1029

11-
build:
12-
name: Build
30+
build_pkgs:
31+
name: Build Packages
32+
needs: build_docker
1333
runs-on: ubuntu-latest
1434
strategy:
1535
matrix:
@@ -24,7 +44,7 @@ jobs:
2444
- name: Set up Go 1.x
2545
uses: actions/setup-go@v2
2646
with:
27-
go-version: ^1.15
47+
go-version: ^${{ env.GOLANG_VERSION }}
2848
id: go
2949

3050
- name: Check out code into the Go module directory

Diff for: .github/workflows/release.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ on:
33
push:
44
tags:
55
- '*'
6+
env:
7+
GOLANG_VERSION: 1.17
68

79
jobs:
810
create_release:
@@ -60,7 +62,7 @@ jobs:
6062
- name: Set up Go 1.x
6163
uses: actions/setup-go@v2
6264
with:
63-
go-version: ^1.15
65+
go-version: ^${{ env.GOLANG_VERSION }}
6466
id: go
6567

6668
- name: Check out code into the Go module directory

Diff for: CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
77

88
## [Unreleased](../../releases/tag/X.Y.Z)
99

10+
### Fixed
11+
12+
- Bumped Go version to 1.17 and frolvlad/alpine-glibc.
13+
14+
### Internal
15+
16+
- Update Github CI workflow.
17+
1018
## [1.4.3](../../releases/tag/1.4.3) - 2021-07-10
1119

1220
### Fixed

Diff for: Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Requires Docker v17.06 or later
2-
FROM golang:1.16.7 as builder
2+
FROM golang:1.17.5 as builder
33
RUN mkdir -p /go/src/app
44
WORKDIR /go/src/app
55
COPY . /go/src/app
66
RUN go build -v .
77

8-
FROM frolvlad/alpine-glibc:alpine-3.12_glibc-2.32
8+
FROM frolvlad/alpine-glibc:alpine-3.15_glibc-2.33
99

1010
COPY --from=builder /go/src/app/prometheus-sql /usr/local/bin/prometheus-sql
1111

Diff for: Dockerfile.github

-9
This file was deleted.

0 commit comments

Comments
 (0)