Skip to content

Commit e931285

Browse files
authored
Merge pull request #761 from austinvazquez/update-ci
CI updates to resolve warnings and add support for latest Go versions
2 parents a469c0f + b2e2dab commit e931285

File tree

15 files changed

+29
-74
lines changed

15 files changed

+29
-74
lines changed

.github/workflows/test.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
steps:
1616
- uses: actions/setup-go@v3
1717
with:
18-
go-version: 1.17
18+
go-version: 1.20.x
1919
- uses: actions/checkout@v3
2020
- uses: golangci/golangci-lint-action@v3
2121
with:
22-
version: v1.46.2
22+
version: v1.51.2
2323

2424
commit:
25-
runs-on: ubuntu-20.04
25+
runs-on: ubuntu-22.04
2626
# Only check commits on pull requests.
2727
if: github.event_name == 'pull_request'
2828
steps:
@@ -40,20 +40,19 @@ jobs:
4040
error: 'Subject too long (max 72)'
4141

4242
test:
43-
runs-on: ubuntu-20.04
43+
runs-on: ubuntu-22.04
4444
strategy:
4545
fail-fast: false
4646
matrix:
47-
go-version: [1.16.x, 1.17.x]
47+
go-version: [1.19.x, 1.20.x]
4848
race: ["-race", ""]
4949

5050
steps:
5151
- name: checkout
52-
uses: actions/checkout@v2
52+
uses: actions/checkout@v3
5353
- name: install go ${{ matrix.go-version }}
54-
uses: actions/setup-go@v2
54+
uses: actions/setup-go@v3
5555
with:
56-
stable: '!contains(${{ matrix.go-version }}, "beta") && !contains(${{ matrix.go-version }}, "rc")'
5756
go-version: ${{ matrix.go-version }}
5857
- name: build
5958
run: make EXTRA_FLAGS="${{ matrix.race }}"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# oci-runtime-tool [![Build Status](https://travis-ci.org/opencontainers/runtime-tools.svg?branch=master)](https://travis-ci.org/opencontainers/runtime-tools) [![Go Report Card](https://goreportcard.com/badge/github.com/opencontainers/runtime-tools)](https://goreportcard.com/report/github.com/opencontainers/runtime-tools)
22

33
oci-runtime-tool is a collection of tools for working with the [OCI runtime specification][runtime-spec].
4-
To build from source code, runtime-tools requires Go 1.10.x or above.
4+
To build from source code, runtime-tools requires Go 1.19.x or above.
55

66
## Table of Contents
77

go.mod

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/opencontainers/runtime-tools
22

3-
go 1.16
3+
go 1.19
44

55
require (
66
github.com/blang/semver/v4 v4.0.0
@@ -18,4 +18,11 @@ require (
1818
golang.org/x/sys v0.0.0-20191115151921-52ab43148777
1919
)
2020

21-
require gopkg.in/yaml.v2 v2.4.0 // indirect
21+
require (
22+
github.com/davecgh/go-spew v1.1.1 // indirect
23+
github.com/hashicorp/errwrap v1.0.0 // indirect
24+
github.com/pmezard/go-difflib v1.0.0 // indirect
25+
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
26+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
27+
gopkg.in/yaml.v2 v2.4.0 // indirect
28+
)

vendor/github.com/blang/semver/v4/go.mod

Lines changed: 0 additions & 3 deletions
This file was deleted.

vendor/github.com/google/uuid/go.mod

Lines changed: 0 additions & 1 deletion
This file was deleted.

vendor/github.com/hashicorp/errwrap/go.mod

Lines changed: 0 additions & 1 deletion
This file was deleted.

vendor/github.com/hashicorp/go-multierror/go.mod

Lines changed: 0 additions & 5 deletions
This file was deleted.

vendor/github.com/hashicorp/go-multierror/go.sum

Lines changed: 0 additions & 2 deletions
This file was deleted.

vendor/github.com/mrunalp/fileutils/go.mod

Lines changed: 0 additions & 3 deletions
This file was deleted.

vendor/github.com/sirupsen/logrus/go.mod

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)