Skip to content

Commit f925ff7

Browse files
committed
Update dependencies
Signed-off-by: Xabier Larrakoetxea <me@slok.dev>
1 parent 7c58d95 commit f925ff7

File tree

4 files changed

+358
-42
lines changed

4 files changed

+358
-42
lines changed

.github/workflows/ci.yaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
name: Check
88
runs-on: ubuntu-latest
99
# Execute the checks inside the container instead the VM.
10-
container: golangci/golangci-lint:v1.27.0-alpine
10+
container: golangci/golangci-lint:v1.34.1-alpine
1111
steps:
1212
- uses: actions/checkout@v1
1313
- run: golangci-lint run -E goimports
@@ -16,10 +16,10 @@ jobs:
1616
name: Test
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v1
20-
- uses: actions/setup-go@v1
19+
- uses: actions/checkout@v2
20+
- uses: actions/setup-go@v2
2121
with:
22-
go-version: 1.14
22+
go-version: 1.15
2323
- run: make ci-test
2424

2525
release-image:
@@ -34,9 +34,8 @@ jobs:
3434
runs-on: ubuntu-latest
3535
# Only run in master and when has a tag.
3636
steps:
37-
- name: Set tag on VERSION env var
38-
run: echo ::set-env name=VERSION::$(echo ${GITHUB_REF:10})
39-
- uses: actions/checkout@v1
37+
- run: echo "VERSION=${GITHUB_REF#refs/*/}" >> ${GITHUB_ENV} # Sets VERSION env var.
38+
- uses: actions/checkout@v2
4039
- name: Build image
4140
run: make build-image
4241
- name: Docker login

docker/dev/Dockerfile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
FROM golang:1.14
1+
FROM golang:1.15
22

3-
ARG GOLANGCI_LINT_VERSION="1.25.0"
3+
ARG GOLANGCI_LINT_VERSION="1.34.1"
4+
ARG MOCKERY_VERSION="2.5.1"
45
ARG ostype=Linux
56

67
RUN apt-get update && apt-get install -y \
@@ -11,9 +12,13 @@ RUN apt-get update && apt-get install -y \
1112

1213
RUN wget https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCI_LINT_VERSION}/golangci-lint-${GOLANGCI_LINT_VERSION}-linux-amd64.tar.gz && \
1314
tar zxvf golangci-lint-${GOLANGCI_LINT_VERSION}-linux-amd64.tar.gz --strip 1 -C /usr/local/bin/ && \
14-
rm golangci-lint-${GOLANGCI_LINT_VERSION}-linux-amd64.tar.gz
15+
rm golangci-lint-${GOLANGCI_LINT_VERSION}-linux-amd64.tar.gz && \
16+
\
17+
wget https://github.com/vektra/mockery/releases/download/v${MOCKERY_VERSION}/mockery_${MOCKERY_VERSION}_Linux_x86_64.tar.gz && \
18+
tar zxvf mockery_${MOCKERY_VERSION}_Linux_x86_64.tar.gz -C /tmp && \
19+
mv /tmp/mockery /usr/local/bin/ && \
20+
rm mockery_${MOCKERY_VERSION}_Linux_x86_64.tar.gz
1521

16-
RUN go get -u github.com/vektra/mockery/...
1722

1823
# Create user.
1924
ARG uid=1000

go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ require (
55
github.com/gin-gonic/gin v1.6.3
66
github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible
77
github.com/oklog/run v1.1.0
8-
github.com/prometheus/alertmanager v0.20.0
8+
github.com/prometheus/alertmanager v0.21.0
99
github.com/prometheus/client_golang v1.6.0
1010
github.com/prometheus/common v0.10.0
11-
github.com/sirupsen/logrus v1.6.0
12-
github.com/slok/go-http-metrics v0.7.0
13-
github.com/stretchr/testify v1.6.0
11+
github.com/sirupsen/logrus v1.7.0
12+
github.com/slok/go-http-metrics v0.8.0
13+
github.com/stretchr/testify v1.6.1
1414
github.com/technoweenie/multipartstreamer v1.0.1 // indirect
1515
gopkg.in/alecthomas/kingpin.v2 v2.2.6
1616
)
1717

18-
go 1.14
18+
go 1.15

0 commit comments

Comments
 (0)