Use golang:1.15.x, remove jessie tarball build

This commit is contained in:
Tim Vaillancourt 2020-12-17 17:26:51 +01:00
parent 8ae02ef69c
commit dd2568631a
4 changed files with 4 additions and 6 deletions

View File

@ -10,10 +10,10 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Set up Go 1.14 - name: Set up Go 1.15
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: 1.14 go-version: 1.15
- name: Build - name: Build
run: script/cibuild run: script/cibuild

View File

@ -1,6 +1,6 @@
# #
FROM golang:1.14.7 FROM golang:1.15.6
RUN apt-get update RUN apt-get update
RUN apt-get install -y ruby ruby-dev rubygems build-essential RUN apt-get install -y ruby ruby-dev rubygems build-essential

View File

@ -1,4 +1,4 @@
FROM golang:1.14.7 FROM golang:1.15.6
LABEL maintainer="github@github.com" LABEL maintainer="github@github.com"
RUN apt-get update RUN apt-get update

View File

@ -32,6 +32,4 @@ cp ${tarball}.gz "$BUILD_ARTIFACT_DIR"/gh-ost/
# blame @carlosmn, @mattr and @timvaillancourt- # blame @carlosmn, @mattr and @timvaillancourt-
# Allow builds on buster to also be used for stretch + jessie # Allow builds on buster to also be used for stretch + jessie
stretch_tarball_name=$(echo $(basename "${tarball}") | sed s/-buster-/-stretch-/) stretch_tarball_name=$(echo $(basename "${tarball}") | sed s/-buster-/-stretch-/)
jessie_tarball_name=$(echo $(basename "${stretch_tarball_name}") | sed s/-stretch-/-jessie-/)
cp ${tarball}.gz "$BUILD_ARTIFACT_DIR/gh-ost/${stretch_tarball_name}.gz" cp ${tarball}.gz "$BUILD_ARTIFACT_DIR/gh-ost/${stretch_tarball_name}.gz"
cp ${tarball}.gz "$BUILD_ARTIFACT_DIR/gh-ost/${jessie_tarball_name}.gz"