mirror of
https://github.com/gomods/athens
synced 2026-02-03 07:30:32 +00:00
Merge branch 'master' into gh-actions
This commit is contained in:
+2
-2
@@ -4,7 +4,7 @@ name: default
|
||||
|
||||
steps:
|
||||
- name: download-dependencies
|
||||
image: golang:1.13
|
||||
image: golang:1.14
|
||||
commands:
|
||||
# wait for services to be ready.
|
||||
- cd scripts/liveness_probe
|
||||
@@ -20,7 +20,7 @@ steps:
|
||||
path: /go
|
||||
|
||||
- name: build
|
||||
image: golang:1.13
|
||||
image: golang:1.14
|
||||
commands:
|
||||
|
||||
# build
|
||||
|
||||
@@ -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.
|
||||
|
||||
**How is the fix applied?**
|
||||
## How is the fix applied?
|
||||
|
||||
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 #
|
||||
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
ARG GOLANG_VERSION=1.12
|
||||
ARG GOLANG_VERSION=1.14
|
||||
FROM golang:$GOLANG_VERSION
|
||||
|
||||
RUN echo $GOLANG_VERSION
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@ environment:
|
||||
GOPROXY: https://proxy.golang.org
|
||||
SKIP_UNTIL_113: true
|
||||
|
||||
stack: go 1.13
|
||||
stack: go 1.14
|
||||
|
||||
test_script:
|
||||
- go test ./...
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
# You can override the Go version used to build the image.
|
||||
# See project Makefile if using make.
|
||||
# See docker --build-arg if building directly.
|
||||
ARG GOLANG_VERSION=1.13
|
||||
ARG GOLANG_VERSION=1.14
|
||||
FROM golang:${GOLANG_VERSION}-alpine AS builder
|
||||
|
||||
WORKDIR $GOPATH/src/github.com/gomods/athens
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM golang:1.12-stretch
|
||||
FROM golang:1.14-stretch
|
||||
|
||||
WORKDIR /tmp
|
||||
|
||||
|
||||
Reference in New Issue
Block a user