Skip to content
This repository has been archived by the owner on Sep 30, 2024. It is now read-only.

Commit

Permalink
Merge pull request #1391 from openark/go116
Browse files Browse the repository at this point in the history
Build/CI: using golang 1.16
  • Loading branch information
shlomi-noach authored Jul 27, 2021
2 parents 1b9ee80 + 85cdd58 commit 23a8990
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/system.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.packaging
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.raft
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.14.4-stretch
FROM golang:1.16.6-stretch
LABEL maintainer="[email protected]"

RUN apt-get update -q -y
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.system
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.14.4-stretch
FROM golang:1.16.6-stretch
LABEL maintainer="[email protected]"

RUN apt-get update -q -y
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.14.4-stretch
FROM golang:1.16.6-stretch
LABEL maintainer="[email protected]"

RUN apt-get update
Expand Down
4 changes: 2 additions & 2 deletions script/ensure-go-installed
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/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
Expand Down

0 comments on commit 23a8990

Please sign in to comment.