Skip to content

Commit b22eb55

Browse files
anshalshuklaustiugov
authored andcommitted
Updated to Golang 1.19
and refactored deprecated API of the dependencies (io/utils) Signed-off-by: Dmitrii Ustiugov <dmitrii.ustiugov@ed.ac.uk>
1 parent ee098e2 commit b22eb55

File tree

34 files changed

+340
-301
lines changed

34 files changed

+340
-301
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
build:
2323
strategy:
2424
matrix:
25-
go: ['1.16', '1.17', '1.18']
25+
go: ['1.18', '1.19']
2626
# Build all variants regardless of failures
2727
fail-fast: false
2828

.github/workflows/cri_minio_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
- name: Setup TMPDIR
3535
run: mkdir -p $TMPDIR
3636

37-
- name: Set up Go 1.18
37+
- name: Set up Go 1.19
3838
uses: actions/setup-go@v4
3939
with:
40-
go-version: 1.18
40+
go-version: '1.19'
4141

4242
- name: Check out code into the Go module directory
4343
uses: actions/checkout@v3

.github/workflows/integration_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
test-name: [test, test-man-bench]
3030
steps:
3131

32-
- name: Set up Go 1.18
32+
- name: Set up Go 1.19
3333
uses: actions/setup-go@v4
3434
with:
35-
go-version: 1.18
35+
go-version: '1.19'
3636

3737
- name: Set up Python 3.x
3838
uses: actions/setup-python@v4

.github/workflows/nightly_tests.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ jobs:
2020
- name: Setup TMPDIR
2121
run: mkdir -p $TMPDIR
2222

23-
- name: Set up Go 1.18
24-
uses: actions/setup-go@v4
23+
- name: Set up Go 1.19 uses: actions/setup-go@v4
2524
with:
26-
go-version: 1.18
25+
go-version: '1.19'
2726

2827
- name: Upgrade git
2928
run: |
@@ -72,10 +71,10 @@ jobs:
7271
- name: Setup TMPDIR
7372
run: mkdir -p $TMPDIR
7473

75-
- name: Set up Go 1.18
74+
- name: Set up Go 1.19
7675
uses: actions/setup-go@v4
7776
with:
78-
go-version: 1.18
77+
go-version: '1.19'
7978

8079
- name: Check out code into the Go module directory
8180
uses: actions/checkout@v3

.github/workflows/stargz_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Set up Go 1.19
4646
uses: actions/setup-go@v4
4747
with:
48-
go-version: 1.19
48+
go-version: '1.19'
4949

5050
- name: Create k8s Kind Cluster
5151
run: bash ./scripts/stargz/01-kind.sh
@@ -76,4 +76,4 @@ jobs:
7676
run: kn service apply stargz-test -f ./configs/knative_workloads/stargz-node.yaml --concurrency-target 1
7777

7878
- name: Curl container
79-
run: curl http://stargz-test.default.127.0.0.1.sslip.io | grep "Hello World"
79+
run: curl http://stargz-test.default.127.0.0.1.sslip.io | grep "Hello World"

.github/workflows/unit_tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
module: [taps, misc, profile]
3030
steps:
3131

32-
- name: Set up Go 1.18
32+
- name: Set up Go 1.19
3333
uses: actions/setup-go@v4
3434
with:
35-
go-version: 1.18
35+
go-version: '1.19'
3636

3737
- name: Set up Python 3.x
3838
uses: actions/setup-python@v4
@@ -65,10 +65,10 @@ jobs:
6565
runs-on: [self-hosted, integ]
6666
steps:
6767

68-
- name: Set up Go 1.18
68+
- name: Set up Go 1.19
6969
uses: actions/setup-go@v4
7070
with:
71-
go-version: 1.18
71+
go-version: '1.19'
7272

7373
- name: Upgrade git
7474
run: |

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ for arbitrary serverless deployments.
8080

8181
### Changed
8282

83-
- Bumped Containerd to v1.5.2.
83+
- Bumped Containerd to v1.6.0.
8484
- Bumped Knative to v0.23.0.
8585
- Bumped Go to v1.16.4.
8686
- Frozen Kubernetes at v1.20.6-00.

examples/deployer/client.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"encoding/json"
2727
"flag"
2828
"fmt"
29-
"io/ioutil"
29+
"os"
3030
"os/exec"
3131
"path/filepath"
3232

@@ -47,7 +47,7 @@ type functionType struct {
4747
// number of functions to deploy from the same file (with different names)
4848
Count int `json:"count"`
4949

50-
Eventing bool `json:"eventing"`
50+
Eventing bool `json:"eventing"`
5151
ApplyScript string `json:"applyScript"`
5252
}
5353

@@ -77,7 +77,7 @@ func main() {
7777

7878
func getFuncSlice(file string) []functionType {
7979
log.Debug("Opening JSON file with functions: ", file)
80-
byteValue, err := ioutil.ReadFile(file)
80+
byteValue, err := os.ReadFile(file)
8181
if err != nil {
8282
log.Fatal(err)
8383
}
@@ -150,7 +150,7 @@ func writeEndpoints(filePath string, urls []string) {
150150
if err != nil {
151151
log.Fatalln("failed to marshal", err)
152152
}
153-
if err := ioutil.WriteFile(filePath, data, 0644); err != nil {
153+
if err := os.WriteFile(filePath, data, 0644); err != nil {
154154
log.Fatalln("failed to write", err)
155155
}
156156
}

examples/deployer/go.mod

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
module github.com/vhive-serverless/vhive/examples/deployer
22

3-
go 1.16
3+
go 1.19
44

55
replace github.com/vhive-serverless/vhive/examples/endpoint => ../endpoint
66

77
require (
8-
github.com/vhive-serverless/vhive/examples/endpoint v0.0.0-00010101000000-000000000000
98
github.com/sirupsen/logrus v1.8.1
9+
github.com/vhive-serverless/vhive/examples/endpoint v0.0.0-00010101000000-000000000000
1010
)
11+
12+
require golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 // indirect

examples/endpoint/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
module "github.com/vhive-serverless/vhive/examples/endpoint"
2-
1+
module github.com/vhive-serverless/vhive/examples/endpoint
32

3+
go 1.19

0 commit comments

Comments
 (0)