Merge branch 'master' into gh-actions

This commit is contained in:
Aaron Schlesinger
2020-02-27 11:50:02 -08:00
committed by GitHub
6 changed files with 21 additions and 9 deletions
+2 -2
View File
@@ -4,7 +4,7 @@ name: default
steps: steps:
- name: download-dependencies - name: download-dependencies
image: golang:1.13 image: golang:1.14
commands: commands:
# wait for services to be ready. # wait for services to be ready.
- cd scripts/liveness_probe - cd scripts/liveness_probe
@@ -20,7 +20,7 @@ steps:
path: /go path: /go
- name: build - name: build
image: golang:1.13 image: golang:1.14
commands: commands:
# build # build
+15 -3
View File
@@ -1,13 +1,25 @@
<!--
Welcome, Athenian! Can you do us two quick favors before you submit your PR?
1. Briefly fill out the sections below. It will make it easy for us to review your code
2. Put "[WIP]" at the beginning of your PR title if you're not ready to have this merged yet (we have a bot that will tell everyone that it's a work in progress)
-->
**What is the problem I am trying to address?** ## What is the problem I am trying to address?
Describe the issue you have been trying to solve. Describe the issue you have been trying to solve.
**How is the fix applied?** ## How is the fix applied?
Mention briefly how you have applied the fix. Mention briefly how you have applied the fix.
**Mention the issue number it fixes or add the details of the changes if it doesn't have a specific issue.** ## What GitHub issue(s) does this PR fix or close?
<!--
If it doesn't fix any issues, that's ok. You can leave this blank.
If it does, then use the below "Fixes #<issue number>" notation below
-->
Fixes # Fixes #
+1 -1
View File
@@ -1,4 +1,4 @@
ARG GOLANG_VERSION=1.12 ARG GOLANG_VERSION=1.14
FROM golang:$GOLANG_VERSION FROM golang:$GOLANG_VERSION
RUN echo $GOLANG_VERSION RUN echo $GOLANG_VERSION
+1 -1
View File
@@ -8,7 +8,7 @@ environment:
GOPROXY: https://proxy.golang.org GOPROXY: https://proxy.golang.org
SKIP_UNTIL_113: true SKIP_UNTIL_113: true
stack: go 1.13 stack: go 1.14
test_script: test_script:
- go test ./... - go test ./...
+1 -1
View File
@@ -5,7 +5,7 @@
# You can override the Go version used to build the image. # You can override the Go version used to build the image.
# See project Makefile if using make. # See project Makefile if using make.
# See docker --build-arg if building directly. # See docker --build-arg if building directly.
ARG GOLANG_VERSION=1.13 ARG GOLANG_VERSION=1.14
FROM golang:${GOLANG_VERSION}-alpine AS builder FROM golang:${GOLANG_VERSION}-alpine AS builder
WORKDIR $GOPATH/src/github.com/gomods/athens WORKDIR $GOPATH/src/github.com/gomods/athens
+1 -1
View File
@@ -1,4 +1,4 @@
FROM golang:1.12-stretch FROM golang:1.14-stretch
WORKDIR /tmp WORKDIR /tmp