Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 51a5feb

Browse files
authoredMar 15, 2021
Merge pull request operator-framework#604 from joelanford/go-1-15
Bump all Go binary builds to 1.15
2 parents 92a0d74 + cb29f3c commit 51a5feb

7 files changed

+10
-8
lines changed
 

‎.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- uses: actions/checkout@v2
3434
- uses: actions/setup-go@v2
3535
with:
36-
go-version: '~1.14'
36+
go-version: '~1.15'
3737
- run: |
3838
echo "asset_path=bin/opm" >> $GITHUB_ENV
3939
echo "asset_name=$(go env GOOS)-$(go env GOARCH)-opm$(go env GOEXE)" >> $GITHUB_ENV

‎.github/workflows/test.yml

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
- uses: actions/checkout@v2
3030
- run: |
3131
sudo apt-get update \
32+
&& sudo apt-get remove msodbcsql17 -y \
3233
&& sudo apt-get remove buildah podman -y \
3334
&& sudo apt-get autoremove -y \
3435
&& sudo apt-get upgrade \
@@ -64,6 +65,7 @@ jobs:
6465
- uses: actions/checkout@v2
6566
- run: |
6667
sudo apt-get update \
68+
&& sudo apt-get remove msodbcsql17 -y \
6769
&& sudo apt-get remove buildah podman -y \
6870
&& sudo apt-get autoremove -y \
6971
&& sudo apt-get upgrade \

‎appr-registry.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM golang:1.13-alpine as builder
1+
FROM golang:1.15-alpine as builder
22

33
RUN apk update && apk add sqlite build-base git mercurial bash
44
WORKDIR /go/src/github.com/operator-framework/operator-registry
55

66
COPY . .
77
RUN make static
88

9-
FROM golang:1.13-alpine as probe-builder
9+
FROM golang:1.15-alpine as probe-builder
1010

1111
RUN apk update && apk add build-base git
1212
ENV ORG github.com/grpc-ecosystem

‎codegen.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13-alpine
1+
FROM golang:1.15-alpine
22

33
RUN apk update && \
44
apk add make git protobuf
@@ -16,4 +16,4 @@ COPY pkg pkg
1616
COPY Makefile Makefile
1717
RUN make codegen
1818

19-
LABEL maintainer="Odin Team <aos-odin@redhat.com>"
19+
LABEL maintainer="Odin Team <aos-odin@redhat.com>"

‎registry.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13-alpine as builder
1+
FROM golang:1.15-alpine as builder
22

33
RUN apk update && apk add sqlite build-base git mercurial bash
44
WORKDIR /build

‎upstream-builder.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13-alpine as builder
1+
FROM golang:1.15-alpine as builder
22

33
RUN apk update && apk add sqlite build-base git mercurial bash
44
WORKDIR /build

‎upstream-opm-builder.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13-alpine AS builder
1+
FROM golang:1.15-alpine AS builder
22

33
RUN apk update && apk add sqlite build-base git mercurial bash
44
WORKDIR /build

0 commit comments

Comments
 (0)
Please sign in to comment.