Skip to content

Commit

Permalink
Upgrade go version to 1.21
Browse files Browse the repository at this point in the history
- Update base-images
- Update mod files
- Update CI workflows
- Update some deprecated functions

Signed-off-by: David Schall <[email protected]>
  • Loading branch information
dhschall committed Oct 18, 2023
1 parent 1ed43cb commit 90429b7
Show file tree
Hide file tree
Showing 50 changed files with 136 additions and 320 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
GOPRIVATE_KEY: ${{ secrets.XDT_REPO_ACCESS_KEY }}
GOPRIVATE: "github.com/ease-lab/vhive-xdt"
steps:
- name: Setup Go 1.18
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: '1.21'
- name: Checkout code into go module directory
uses: actions/checkout@v4

Expand All @@ -48,3 +48,4 @@ jobs:
skip-cache: true
skip-pkg-cache: true
skip-build-cache: true
args: --timeout=3m
4 changes: 2 additions & 2 deletions .github/workflows/e2e-aes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: '1.18'
go-version: '1.21'

- name: Login to Docker Hub
uses: docker/login-action@v3
Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: '1.21'

## Setup a Knative cluster to test the service
- name: Create k8s Kind Cluster
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: '1.18'
go-version: '1.21'

- name: Login to Docker Hub
uses: docker/login-action@v3
Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: '1.21'

## Setup a Knative cluster to test the service
- name: Create k8s Kind Cluster
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-bert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: '1.18'
go-version: '1.21'

- name: Login to Docker Hub
uses: docker/login-action@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-chained-serving.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: '1.21'

## Setup a Knative cluster to test the service
- name: Create k8s Kind Cluster
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-fibonacci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: '1.18'
go-version: '1.21'

- name: Login to Docker Hub
uses: docker/login-action@v3
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: '1.21'

## Setup a Knative cluster to test the service
- name: Create k8s Kind Cluster
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-gg-excamera.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: '1.21'

- name: Deploy executor function
working-directory: benchmarks
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-gg-fibonacci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: '1.21'

- name: Deploy executor function
working-directory: benchmarks
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-gg-llvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: '1.21'

- name: Deploy executor function
working-directory: benchmarks
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-hotel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: '1.18'
go-version: '1.21'

- name: Login to Docker Hub
uses: docker/login-action@v3
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: '1.21'

## Setup a Knative cluster to test the service
- name: Create k8s Kind Cluster
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-map-reduce.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: '1.21'

## Setup a Knative cluster to test the service
- name: Create k8s Kind Cluster
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-online-shop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: '1.21'

## Setup a Knative cluster to test the service
- name: Create k8s Kind Cluster
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-stacking-training.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: '1.21'

- name: Create k8s Kind Cluster
run: bash ./runner/scripts/01-kind.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-trace-plotter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
- uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: '1.21'

- name: Run Trace Plotter
working-directory: tools/trace-plotter
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tuning-halving.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: '1.21'

- name: Create k8s Kind Cluster
run: bash ./runner/scripts/01-kind.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-video-analytics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: '1.21'

## Setup a Knative cluster to test the service
- name: Create k8s Kind Cluster
Expand Down
17 changes: 7 additions & 10 deletions .github/workflows/invoker-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,18 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: '1.18'
go-version: '1.21'

- name: Install protoc
run: |
PROTOC_ZIP=protoc-3.14.0-linux-x86_64
curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.14.0/$PROTOC_ZIP.zip
unzip -o $PROTOC_ZIP.zip -d $HOME/.local
chmod +x $HOME/.local/bin/protoc
rm -f $PROTOC_ZIP.zip
- name: Install Protoc
uses: arduino/setup-protoc@v2
with:
version: "23.4"

- name: Build invoker
working-directory: tools/invoker
run: |
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.31
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
chmod +x $(go env GOPATH)/bin/*
export PATH="$PATH:$(go env GOPATH)/bin"
make invoker
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/relay-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: '1.18'
go-version: '1.21'

- name: Login to Docker Hub
uses: docker/login-action@v3
Expand All @@ -65,8 +65,8 @@ jobs:

- name: Setup go dependencies
run: |
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.31
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
# chmod +x $(go env GOPATH)/bin/*
# export PATH="$PATH:$(go env GOPATH)/bin"
Expand All @@ -91,7 +91,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: '1.18'
go-version: '1.21'

- name: Start container
working-directory: benchmarks/aes
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: '1.21'

- name: Run tests
run: go test -v -race -cover ./...
Expand All @@ -47,7 +47,7 @@ jobs:
- name: Set up Go 1.18
uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: '1.21'

- name: Set up Python 3.x
uses: actions/setup-python@v4
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/aes/go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

module aes

go 1.18
go 1.21

replace github.com/vhive-serverless/vSwarm/utils/tracing/go => ../../../utils/tracing/go

Expand Down
2 changes: 1 addition & 1 deletion benchmarks/auth/go/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module auth

go 1.18
go 1.21

replace github.com/vhive-serverless/vSwarm/utils/tracing/go => ../../../utils/tracing/go

Expand Down
2 changes: 1 addition & 1 deletion benchmarks/chained-function-eventing/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module chained_function_eventing

go 1.18
go 1.21

replace github.com/vhive-serverless/vSwarm/tools/benchmarking_eventing => ../../tools/benchmarking_eventing

Expand Down
2 changes: 1 addition & 1 deletion benchmarks/chained-function-serving/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module tests/chained-functions-serving

go 1.18
go 1.21

replace (
github.com/ease-lab/vhive-xdt/proto/crossXDT => github.com/ease-lab/vhive-xdt/proto/crossXDT v0.0.0-20221107151004-a0940018d178
Expand Down
5 changes: 3 additions & 2 deletions benchmarks/chained-function-serving/producer/producer.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ package main

import (
"context"
"crypto/rand"
"flag"
"fmt"
storage "github.com/vhive-serverless/vSwarm/utils/storage/go"
"math/rand"
"net"
"os"
"strconv"

storage "github.com/vhive-serverless/vSwarm/utils/storage/go"

sdk "github.com/ease-lab/vhive-xdt/sdk/golang"
"github.com/ease-lab/vhive-xdt/utils"
"google.golang.org/grpc/credentials/insecure"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/corral/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module tests/word_count/v2

go 1.18
go 1.21

replace (
github.com/bcongdon/corral => github.com/ease-lab/corral v0.0.0-20221114011422-c2c72270c3e8
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/fibonacci/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

module fibonacci

go 1.18
go 1.21

replace github.com/vhive-serverless/vSwarm/utils/tracing/go => ../../utils/tracing/go

Expand Down
2 changes: 1 addition & 1 deletion benchmarks/gg/benchmarks/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module gg/fibonacci

go 1.18
go 1.21

require (
google.golang.org/grpc v1.48.0
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/hotel-app/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

module github.com/vhive-serverless/vSwarm/benchmarks/hotel-app

go 1.18
go 1.21

replace github.com/vhive-serverless/vSwarm/utils/tracing/go => ../../utils/tracing/go

Expand Down
2 changes: 1 addition & 1 deletion benchmarks/online-shop/checkoutservice/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/GoogleCloudPlatform/microservices-demo/src/checkoutservice

go 1.18
go 1.21

require (
cloud.google.com/go/profiler v0.3.0
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/online-shop/productcatalogservice/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/GoogleCloudPlatform/microservices-demo/src/productcatalogservice

go 1.18
go 1.21

require (
cloud.google.com/go/profiler v0.3.0
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/online-shop/shippingservice/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/GoogleCloudPlatform/microservices-demo/src/shippingservice

go 1.18
go 1.21

require (
cloud.google.com/go/profiler v0.3.0
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/video-analytics/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module tests/video_analytics

go 1.18
go 1.21

replace (
github.com/ease-lab/vhive-xdt/proto/crossXDT => github.com/ease-lab/vhive-xdt/proto/crossXDT v0.0.0-20221107151004-a0940018d178
Expand Down
2 changes: 1 addition & 1 deletion tools/benchmarking_eventing/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module eventing

go 1.18
go 1.21

require (
github.com/cloudevents/sdk-go/v2 v2.10.1
Expand Down
Loading

0 comments on commit 90429b7

Please sign in to comment.