Skip to content

Commit c681c54

Browse files
Merge pull request #906 from github/golang1.15
Use golang:1.15.x, remove jessie tarball build
2 parents 8ae02ef + 6029410 commit c681c54

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v2
1212

13-
- name: Set up Go 1.14
13+
- name: Set up Go 1.15
1414
uses: actions/setup-go@v1
1515
with:
16-
go-version: 1.14
16+
go-version: 1.15
1717

1818
- name: Build
1919
run: script/cibuild

Dockerfile.packaging

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22

3-
FROM golang:1.14.7
3+
FROM golang:1.15.6
44

55
RUN apt-get update
66
RUN apt-get install -y ruby ruby-dev rubygems build-essential

Dockerfile.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.14.7
1+
FROM golang:1.15.6
22
LABEL maintainer="[email protected]"
33

44
RUN apt-get update

script/build-deploy-tarball

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ cp ${tarball}.gz "$BUILD_ARTIFACT_DIR"/gh-ost/
3030

3131
### HACK HACK HACK HACK ###
3232
# blame @carlosmn, @mattr and @timvaillancourt-
33-
# Allow builds on buster to also be used for stretch + jessie
33+
# Allow builds on buster to also be used for stretch
3434
stretch_tarball_name=$(echo $(basename "${tarball}") | sed s/-buster-/-stretch-/)
35-
jessie_tarball_name=$(echo $(basename "${stretch_tarball_name}") | sed s/-stretch-/-jessie-/)
3635
cp ${tarball}.gz "$BUILD_ARTIFACT_DIR/gh-ost/${stretch_tarball_name}.gz"
37-
cp ${tarball}.gz "$BUILD_ARTIFACT_DIR/gh-ost/${jessie_tarball_name}.gz"

0 commit comments

Comments
 (0)