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.

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

Update Go to 1.15 in Releases + Check Licenses CI #1665

Merged
merged 5 commits into from
Apr 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 41 additions & 0 deletions .github/workflows/checkLicenses.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Copyright 2019 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: Check Licenses
on:
push:
branches:
- master
- next
pull_request:
branches:
- master
- next
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Go 1.15
uses: actions/setup-go@v1
with:
go-version: 1.15
- run: |
./scripts/create-licenses.sh
# Upload the licenses list so it's available if needed
- uses: actions/upload-artifact@v2
with:
name: Licenses
path: LICENSES.txt
retention-days: 7 # Reduce retention time from 90 days to 7
2 changes: 1 addition & 1 deletion release/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.13-stretch
FROM golang:1.15-stretch
ENV CGO_ENABLED=0
ENV GO111MODULE=on

Expand Down
2 changes: 1 addition & 1 deletion release/Dockerfile.kpt-build
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM golang:1.13
FROM golang:1.15
RUN apt-get -qqy update && \
apt-get install -qqy tar bzip2 gzip jq zip
2 changes: 1 addition & 1 deletion release/gcloud/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.13-stretch AS build
FROM golang:1.15-stretch AS build
ENV CGO_ENABLED=0
ENV GO111MODULE=on

Expand Down
2 changes: 1 addition & 1 deletion scripts/create-licenses.sh
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ mv ${V2_LICENSE_DIR}/v2/LICENSE ${V2_LICENSE_DIR}

# Loop through every vendored package
mozilla_repos=""
for PACKAGE in $(go list -m -json all | jq -r .Path | sort -f); do
for PACKAGE in $(go list -mod=mod -m -json all | jq -r .Path | sort -f); do
if [[ -e "staging/src/${PACKAGE}" ]]; then
# echo "$PACKAGE is a staging package, skipping" > /dev/stderr
continue
Expand Down