Skip to content

Commit

Permalink
Upgrade Go to 1.20.2
Browse files Browse the repository at this point in the history
  • Loading branch information
ARolek committed Mar 28, 2023
1 parent 2d42670 commit f6f61c1
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions .github/actions/amazon-linux-build-action/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ FROM amazonlinux:latest
RUN yum install -y tar gzip gcc

# install Go
ENV GOLANG_VERSION 1.19.3
ENV GOLANG_VERSION_SHA256 74b9640724fd4e6bb0ed2a1bc44ae813a03f1e72a4c76253e2d5c015494430ba
ENV GOLANG_VERSION 1.20.2
ENV GOLANG_VERSION_SHA256 4eaea32f59cde4dc635fbc42161031d13e1c780b87097f4b4234cfce671f1768

RUN curl -o golang.tar.gz https://dl.google.com/go/go$GOLANG_VERSION.linux-amd64.tar.gz \
&& echo "$GOLANG_VERSION_SHA256 golang.tar.gz" | sha256sum --strict --check \
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/tegola-setup-env/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ runs:
using: "composite"
steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Download version artifact
uses: actions/download-artifact@v1
Expand All @@ -29,9 +29,9 @@ runs:
if: ${{ inputs.ui == 'true' }}

- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: 1.19
go-version: 1.20.2
if: ${{ inputs.go == 'true' }}

- name: Set tegola version
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/on_pr_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:

test:
name: Test on Ubuntu
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

services:
# label used to access the service container
Expand All @@ -31,12 +31,12 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up Go 1.18
uses: actions/setup-go@v2
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.18
go-version: 1.20.2

- name: Env Debug
run: |
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/on_release_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:

gen_version:
name: Generate software version
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v3

# on release, we want to use release.tag_name for the version
- name: Set tegola version (use release.tag_name)
Expand Down Expand Up @@ -47,16 +47,16 @@ jobs:

build_ui:
name: Build for embedded ui
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up Go 1.18
uses: actions/setup-go@v2
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.18
go-version: 1.20.2

- name: Build embedded UI
run: |
Expand All @@ -73,11 +73,11 @@ jobs:
build_linux:
name: Build for Linux and AWS Lambda
needs: [gen_version,build_ui]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Check out actions
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup env
uses: ./.github/actions/tegola-setup-env
Expand All @@ -102,11 +102,11 @@ jobs:
build_tegola_lambda:
name: Build tegola_lambda on Amazon Linux
needs: [gen_version]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Check out actions
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup env
uses: ./.github/actions/tegola-setup-env
Expand All @@ -133,7 +133,7 @@ jobs:

steps:
- name: Check out actions
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup env
uses: ./.github/actions/tegola-setup-env
Expand All @@ -157,14 +157,14 @@ jobs:
build_docker:
name: Build Docker image and publish to Docker Hub
needs: [gen_version,build_ui]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
DOCKERHUB_ORG: gospatial
DOCKERHUB_REPO: tegola

steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup env
uses: ./.github/actions/tegola-setup-env
Expand Down Expand Up @@ -205,7 +205,7 @@ jobs:

steps:
- name: Check out actions
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup env
uses: ./.github/actions/tegola-setup-env
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# $ docker run -v /path/to/docker-config:/opt/tegola_config -p 8080 tegola serve

# Intermediary container for building
FROM golang:1.19.3-alpine3.16 AS build
FROM golang:1.20.2-alpine3.16 AS build

ARG BUILDPKG="github.com/go-spatial/tegola/internal/build"
ARG VER="Version Not Set"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/go-spatial/tegola

go 1.18
go 1.19

require (
cloud.google.com/go/storage v1.28.0
Expand Down
4 changes: 2 additions & 2 deletions vendor/github.com/mattn/goveralls/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f6f61c1

Please sign in to comment.