Skip to content
This repository was archived by the owner on Feb 18, 2025. It is now read-only.

Commit 85cdd58

Browse files
committed
Using golang 1.16
Signed-off-by: Shlomi Noach <[email protected]>
1 parent 1b9ee80 commit 85cdd58

10 files changed

+16
-16
lines changed

.github/workflows/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v2
1717

18-
- name: Set up Go 1.14
18+
- name: Set up Go 1.16
1919
uses: actions/setup-go@v1
2020
with:
21-
go-version: 1.14
21+
go-version: 1.16
2222

2323
- name: Test source code
2424
run: script/test-source

.github/workflows/system.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- name: Set up Go 1.14
15+
- name: Set up Go 1.16
1616
uses: actions/setup-go@v1
1717
with:
18-
go-version: 1.14
18+
go-version: 1.16
1919

2020
- name: check out
2121
uses: actions/checkout@v2

.github/workflows/upgrade.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
# backend: [sqlite, MySQL]
1212

1313
steps:
14-
- name: Set up Go 1.14
14+
- name: Set up Go 1.16
1515
uses: actions/setup-go@v1
1616
with:
17-
go-version: 1.14
17+
go-version: 1.16
1818

1919
- name: Start local MySQL
2020
run: sudo /etc/init.d/mysql start

build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ function precheck() {
8484
ok=1
8585
fi
8686

87-
if ! go version | egrep -q 'go(1\.1[456])' ; then
88-
echo "go version must be 1.14 or above"
87+
if ! go version | egrep -q 'go(1\.1[6789])' ; then
88+
echo "go version must be 1.16 or above"
8989
ok=1
9090
fi
9191

docker/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# ORC_USER (default: orc_server_user): username used to login to orchestrator backend MySQL server
1515
# ORC_PASSWORD (default: orc_server_password): password used to login to orchestrator backend MySQL server
1616

17-
FROM golang:1.14.4-alpine3.12 as build
17+
FROM golang:1.16.6-alpine3.14 as build
1818

1919
ENV GOPATH=/tmp/go
2020

@@ -28,7 +28,7 @@ RUN rsync -av $(find /tmp/orchestrator-release -type d -name orchestrator -maxde
2828
RUN rsync -av $(find /tmp/orchestrator-release -type d -name orchestrator-client -maxdepth 2)/ /
2929
RUN cp conf/orchestrator-sample-sqlite.conf.json /etc/orchestrator.conf.json
3030

31-
FROM alpine:3.8
31+
FROM alpine:3.14
3232

3333
RUN apk --no-cache add bash curl jq
3434

docker/Dockerfile.packaging

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# ORC_USER (default: orc_server_user): username used to login to orchestrator backend MySQL server
1515
# ORC_PASSWORD (default: orc_server_password): password used to login to orchestrator backend MySQL server
1616

17-
FROM golang:1.14.4-stretch
17+
FROM golang:1.16.6-stretch
1818

1919
RUN apt-get update
2020
RUN apt-get install -y ruby ruby-dev rubygems build-essential

docker/Dockerfile.raft

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.14.4-stretch
1+
FROM golang:1.16.6-stretch
22
LABEL maintainer="[email protected]"
33

44
RUN apt-get update -q -y

docker/Dockerfile.system

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.14.4-stretch
1+
FROM golang:1.16.6-stretch
22
LABEL maintainer="[email protected]"
33

44
RUN apt-get update -q -y

docker/Dockerfile.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.14.4-stretch
1+
FROM golang:1.16.6-stretch
22
LABEL maintainer="[email protected]"
33

44
RUN apt-get update

script/ensure-go-installed

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
PREFERRED_GO_VERSION=go1.14.4
4-
SUPPORTED_GO_VERSIONS='go1.1[456]'
3+
PREFERRED_GO_VERSION=go1.16.6
4+
SUPPORTED_GO_VERSIONS='go1.1[6789]'
55

66
export ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
77
cd $ROOTDIR

0 commit comments

Comments
 (0)