Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: Switch to using Go 1.15 #117

Merged
merged 2 commits into from
Sep 16, 2020
Merged

build: Switch to using Go 1.15 #117

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4200dc5
build: Switch to using Go 1.15
Sep 10, 2020
5cb25c0
Merge branch 'master' into Go1.15
lenny-goodell Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# This file will work as is for local development. No need to use Dockerfile.build

#build stage
ARG BASE=golang:1.13-alpine
ARG BASE=golang:1.15-alpine
FROM ${BASE} AS builder

ARG ALPINE_PKG_BASE="make git gcc libc-dev libsodium-dev zeromq-dev"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#

# This is the base build image for
ARG BASE=golang:1.13-alpine
ARG BASE=golang:1.15-alpine
FROM ${BASE}

LABEL license='SPDX-License-Identifier: Apache-2.0' \
Expand Down
1 change: 0 additions & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@

edgeXBuildGoApp (
project: 'app-service-configurable',
goVersion: '1.13',
buildSnap: true
)
4 changes: 2 additions & 2 deletions bin/test-attribution-txt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ if [ ! -f Attribution.txt ]; then
else
# loop over every library in the modules.txt file in vendor
while IFS= read -r lib; do
if ! grep -q "$lib" Attribution.txt; then
if ! grep -q "$lib" Attribution.txt && [ "$lib" != "explicit" ]; then
echo "An attribution for $lib is missing from in $cmd Attribution.txt, please add"
# need to do this in a bash subshell, see SC2031
(( EXIT_CODE=1 ))
Expand All @@ -56,4 +56,4 @@ fi

cd "$GIT_ROOT"

cleanup
cleanup
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/edgexfoundry/app-service-configurable

go 1.13
go 1.15

require github.com/edgexfoundry/app-functions-sdk-go v1.2.1-dev.22
require github.com/edgexfoundry/app-functions-sdk-go v1.2.1-dev.22
8 changes: 4 additions & 4 deletions snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ parts:
# note - we specifically don't use arch
case "$(dpkg --print-architecture)" in
amd64)
FILE_NAME=go1.13.10.linux-amd64.tar.gz
FILE_HASH=8a4cbc9f2b95d114c38f6cbe94a45372d48c604b707db2057c787398dfbf8e7f
FILE_NAME=go1.15.2.linux-amd64.tar.gz
FILE_HASH=b49fda1ca29a1946d6bb2a5a6982cf07ccd2aba849289508ee0f9918f6bb4552
;;
arm64)
FILE_NAME=go1.13.10.linux-arm64.tar.gz
FILE_HASH=f16f19947855b410e48f395ca488bd39223c7b35e8b69c7f15ec00201e20b572
FILE_NAME=go1.15.2.linux-arm64.tar.gz
FILE_HASH=c8ec460cc82d61604b048f9439c06bd591722efce5cd48f49e19b5f6226bd36d
;;
esac
# download the archive, failing on ssl cert problems
Expand Down