未验证 提交 23a89909 编写于 作者: S Shlomi Noach 提交者: GitHub

Merge pull request #1391 from openark/go116

Build/CI: using golang 1.16
......@@ -15,10 +15,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up Go 1.14
- name: Set up Go 1.16
uses: actions/setup-go@v1
with:
go-version: 1.14
go-version: 1.16
- name: Test source code
run: script/test-source
......
......@@ -12,10 +12,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.14
- name: Set up Go 1.16
uses: actions/setup-go@v1
with:
go-version: 1.14
go-version: 1.16
- name: check out
uses: actions/checkout@v2
......
......@@ -11,10 +11,10 @@ jobs:
# backend: [sqlite, MySQL]
steps:
- name: Set up Go 1.14
- name: Set up Go 1.16
uses: actions/setup-go@v1
with:
go-version: 1.14
go-version: 1.16
- name: Start local MySQL
run: sudo /etc/init.d/mysql start
......
......@@ -84,8 +84,8 @@ function precheck() {
ok=1
fi
if ! go version | egrep -q 'go(1\.1[456])' ; then
echo "go version must be 1.14 or above"
if ! go version | egrep -q 'go(1\.1[6789])' ; then
echo "go version must be 1.16 or above"
ok=1
fi
......
......@@ -14,7 +14,7 @@
# ORC_USER (default: orc_server_user): username used to login to orchestrator backend MySQL server
# ORC_PASSWORD (default: orc_server_password): password used to login to orchestrator backend MySQL server
FROM golang:1.14.4-alpine3.12 as build
FROM golang:1.16.6-alpine3.14 as build
ENV GOPATH=/tmp/go
......@@ -28,7 +28,7 @@ RUN rsync -av $(find /tmp/orchestrator-release -type d -name orchestrator -maxde
RUN rsync -av $(find /tmp/orchestrator-release -type d -name orchestrator-client -maxdepth 2)/ /
RUN cp conf/orchestrator-sample-sqlite.conf.json /etc/orchestrator.conf.json
FROM alpine:3.8
FROM alpine:3.14
RUN apk --no-cache add bash curl jq
......
......@@ -14,7 +14,7 @@
# ORC_USER (default: orc_server_user): username used to login to orchestrator backend MySQL server
# ORC_PASSWORD (default: orc_server_password): password used to login to orchestrator backend MySQL server
FROM golang:1.14.4-stretch
FROM golang:1.16.6-stretch
RUN apt-get update
RUN apt-get install -y ruby ruby-dev rubygems build-essential
......
FROM golang:1.14.4-stretch
FROM golang:1.16.6-stretch
LABEL maintainer="openark@github.com"
RUN apt-get update -q -y
......
FROM golang:1.14.4-stretch
FROM golang:1.16.6-stretch
LABEL maintainer="openark@github.com"
RUN apt-get update -q -y
......
FROM golang:1.14.4-stretch
FROM golang:1.16.6-stretch
LABEL maintainer="openark@github.com"
RUN apt-get update
......
#!/bin/bash
PREFERRED_GO_VERSION=go1.14.4
SUPPORTED_GO_VERSIONS='go1.1[456]'
PREFERRED_GO_VERSION=go1.16.6
SUPPORTED_GO_VERSIONS='go1.1[6789]'
export ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
cd $ROOTDIR
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册