Skip to content

Commit

Permalink
Merge pull request #45 from estesp/update-vendors
Browse files Browse the repository at this point in the history
Update vendors & GH actions workflow
  • Loading branch information
estesp authored Mar 14, 2024
2 parents ea9e43a + 055c2be commit dea0aee
Show file tree
Hide file tree
Showing 242 changed files with 37,798 additions and 2,449 deletions.
30 changes: 14 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:

strategy:
matrix:
go-version: [1.20.x]
go-version: [1.22.x]
os: [ubuntu-22.04, macos-12, windows-2019]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: src/github.com/estesp/mquery

Expand All @@ -34,9 +34,9 @@ jobs:
echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
- uses: golangci/golangci-lint-action@v3
- uses: golangci/golangci-lint-action@v4
with:
version: v1.51.1
version: v1.56.1
skip-cache: true
working-directory: src/github.com/estesp/mquery
args: --timeout=5m
Expand All @@ -50,15 +50,15 @@ jobs:
timeout-minutes: 5

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: src/github.com/estesp/mquery
fetch-depth: 100

- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: 1.20.x
go-version: 1.22.x

- name: Set env
shell: bash
Expand All @@ -67,9 +67,7 @@ jobs:
echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
- name: Install dependencies
env:
GO111MODULE: off
run: go get -u github.com/vbatts/git-validation
run: go install github.com/vbatts/git-validation@latest

- name: DCO
env:
Expand Down Expand Up @@ -105,17 +103,17 @@ jobs:
os: [ubuntu-22.04, macos-12, windows-2019]

steps:
- uses: actions/setup-go@v3
- uses: actions/setup-go@v5
with:
go-version: 1.20.x
go-version: 1.22.x

- name: Set env
shell: bash
run: |
echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: src/github.com/estesp/mquery

Expand All @@ -133,17 +131,17 @@ jobs:
needs: [project, linters]

steps:
- uses: actions/setup-go@v3
- uses: actions/setup-go@v5
with:
go-version: 1.20.x
go-version: 1.22.x

- name: Set env
shell: bash
run: |
echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: src/github.com/estesp/mquery

Expand Down
25 changes: 16 additions & 9 deletions function/go.mod
Original file line number Diff line number Diff line change
@@ -1,34 +1,41 @@
module github.com/estesp/mquery/function

go 1.19
go 1.21

require (
github.com/aws/aws-lambda-go v1.41.0
github.com/aws/aws-sdk-go v1.44.334
github.com/estesp/manifest-tool/v2 v2.0.8
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
github.com/estesp/manifest-tool/v2 v2.1.5
github.com/opencontainers/image-spec v1.1.0
)

require (
github.com/Microsoft/hcsshim v0.9.10 // indirect
github.com/containerd/containerd v1.6.26 // indirect
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
github.com/Microsoft/hcsshim v0.11.4 // indirect
github.com/containerd/containerd v1.7.11 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/docker/cli v23.0.1+incompatible // indirect
github.com/docker/cli v24.0.7+incompatible // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker v24.0.7+incompatible // indirect
github.com/docker/docker-credential-helpers v0.7.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/klauspost/compress v1.15.9 // indirect
github.com/klauspost/compress v1.16.0 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
golang.org/x/net v0.17.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
go.opentelemetry.io/otel v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.13.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/grpc v1.58.3 // indirect
google.golang.org/protobuf v1.31.0 // indirect
oras.land/oras-go/v2 v2.0.0 // indirect
oras.land/oras-go/v2 v2.2.1 // indirect
)
Loading

0 comments on commit dea0aee

Please sign in to comment.