Skip to content

Commit bff6512

Browse files
go1.15 (#74)
1 parent 03a33bf commit bff6512

File tree

6 files changed

+44
-48
lines changed

6 files changed

+44
-48
lines changed

.drone.jsonnet

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ kind: 'pipeline',
3737
name: 'default',
3838
steps: [
3939
BuildStepDry('base'),
40-
BuildStepDry('go-1.14.7', 'dry-run-base'),
41-
BuildStepDry('go-1.13.15', 'dry-run-base'),
40+
BuildStepDry('go-1.15.0'),
41+
BuildStepDry('go-1.14.7'),
4242

4343
BuildStep('base'),
44+
BuildStep('go-1.15.0', 'build-base'),
45+
BuildStep('go-1.15.x', 'build-go-1.15.0'),
4446
BuildStep('go-1.14.7', 'build-base'),
4547
BuildStep('go-1.14.x', 'build-go-1.14.7'),
46-
BuildStep('go-1.13.15', 'build-base'),
47-
BuildStep('go-1.13.x', 'build-go-1.13.15'),
48-
BuildWithDiffTags('go-latest', 'latest', 'build-go-1.14.x'),
48+
BuildWithDiffTags('go-latest', 'latest', 'build-go-1.15.x'),
4949
]
5050
}

.drone.yml

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -24,43 +24,39 @@ steps:
2424
event:
2525
- pull_request
2626

27-
- name: dry-run-go-1.14.7
27+
- name: dry-run-go-1.15.0
2828
pull: always
2929
image: plugins/docker
3030
settings:
31-
context: docker/go-1.14.7
32-
dockerfile: docker/go-1.14.7/Dockerfile
31+
context: docker/go-1.15.0
32+
dockerfile: docker/go-1.15.0/Dockerfile
3333
dry_run: true
3434
password:
3535
from_secret: docker_password
3636
repo: techknowlogick/xgo
37-
tags: go-1.14.7
37+
tags: go-1.15.0
3838
username:
3939
from_secret: docker_username
4040
when:
4141
event:
4242
- pull_request
43-
depends_on:
44-
- dry-run-base
4543

46-
- name: dry-run-go-1.13.15
44+
- name: dry-run-go-1.14.7
4745
pull: always
4846
image: plugins/docker
4947
settings:
50-
context: docker/go-1.13.15
51-
dockerfile: docker/go-1.13.15/Dockerfile
48+
context: docker/go-1.14.7
49+
dockerfile: docker/go-1.14.7/Dockerfile
5250
dry_run: true
5351
password:
5452
from_secret: docker_password
5553
repo: techknowlogick/xgo
56-
tags: go-1.13.15
54+
tags: go-1.14.7
5755
username:
5856
from_secret: docker_username
5957
when:
6058
event:
6159
- pull_request
62-
depends_on:
63-
- dry-run-base
6460

6561
- name: build-base
6662
pull: always
@@ -81,16 +77,16 @@ steps:
8177
exclude:
8278
- pull_request
8379

84-
- name: build-go-1.14.7
80+
- name: build-go-1.15.0
8581
pull: always
8682
image: plugins/docker
8783
settings:
88-
context: docker/go-1.14.7
89-
dockerfile: docker/go-1.14.7/Dockerfile
84+
context: docker/go-1.15.0
85+
dockerfile: docker/go-1.15.0/Dockerfile
9086
password:
9187
from_secret: docker_password
9288
repo: techknowlogick/xgo
93-
tags: go-1.14.7
89+
tags: go-1.15.0
9490
username:
9591
from_secret: docker_username
9692
when:
@@ -102,16 +98,16 @@ steps:
10298
depends_on:
10399
- build-base
104100

105-
- name: build-go-1.14.x
101+
- name: build-go-1.15.x
106102
pull: always
107103
image: plugins/docker
108104
settings:
109-
context: docker/go-1.14.x
110-
dockerfile: docker/go-1.14.x/Dockerfile
105+
context: docker/go-1.15.x
106+
dockerfile: docker/go-1.15.x/Dockerfile
111107
password:
112108
from_secret: docker_password
113109
repo: techknowlogick/xgo
114-
tags: go-1.14.x
110+
tags: go-1.15.x
115111
username:
116112
from_secret: docker_username
117113
when:
@@ -121,18 +117,18 @@ steps:
121117
exclude:
122118
- pull_request
123119
depends_on:
124-
- build-go-1.14.7
120+
- build-go-1.15.0
125121

126-
- name: build-go-1.13.15
122+
- name: build-go-1.14.7
127123
pull: always
128124
image: plugins/docker
129125
settings:
130-
context: docker/go-1.13.15
131-
dockerfile: docker/go-1.13.15/Dockerfile
126+
context: docker/go-1.14.7
127+
dockerfile: docker/go-1.14.7/Dockerfile
132128
password:
133129
from_secret: docker_password
134130
repo: techknowlogick/xgo
135-
tags: go-1.13.15
131+
tags: go-1.14.7
136132
username:
137133
from_secret: docker_username
138134
when:
@@ -144,16 +140,16 @@ steps:
144140
depends_on:
145141
- build-base
146142

147-
- name: build-go-1.13.x
143+
- name: build-go-1.14.x
148144
pull: always
149145
image: plugins/docker
150146
settings:
151-
context: docker/go-1.13.x
152-
dockerfile: docker/go-1.13.x/Dockerfile
147+
context: docker/go-1.14.x
148+
dockerfile: docker/go-1.14.x/Dockerfile
153149
password:
154150
from_secret: docker_password
155151
repo: techknowlogick/xgo
156-
tags: go-1.13.x
152+
tags: go-1.14.x
157153
username:
158154
from_secret: docker_username
159155
when:
@@ -163,7 +159,7 @@ steps:
163159
exclude:
164160
- pull_request
165161
depends_on:
166-
- build-go-1.13.15
162+
- build-go-1.14.7
167163

168164
- name: build-go-latest
169165
pull: always
@@ -184,6 +180,6 @@ steps:
184180
exclude:
185181
- pull_request
186182
depends_on:
187-
- build-go-1.14.x
183+
- build-go-1.15.x
188184

189185
...

docker/go-1.13.15/Dockerfile

Lines changed: 0 additions & 10 deletions
This file was deleted.

docker/go-1.15.0/Dockerfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
FROM techknowlogick/xgo:base
2+
3+
# Configure the root Go distribution and bootstrap based on it
4+
ENV GO_VERSION 1150
5+
6+
RUN \
7+
export ROOT_DIST=https://dl.google.com/go/go1.15.linux-amd64.tar.gz && \
8+
export ROOT_DIST_SHA=2d75848ac606061efe52a8068d0e647b35ce487a15bb52272c427df485193602 && \
9+
\
10+
$BOOTSTRAP_PURE

docker/go-1.13.x/Dockerfile renamed to docker/go-1.15.x/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
#
44
# Released under the MIT license.
55

6-
FROM techknowlogick/xgo:go-1.13.15
6+
FROM techknowlogick/xgo:go-1.15.0

docker/go-latest/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
#
55
# Released under the MIT license.
66

7-
FROM techknowlogick/xgo:go-1.14.x
7+
FROM techknowlogick/xgo:go-1.15.x
88

99
LABEL maintainer="techknowlogick <[email protected]>"

0 commit comments

Comments
 (0)