Skip to content

Commit

Permalink
Attempt to revive CI
Browse files Browse the repository at this point in the history
Signed-off-by: Jon Johnson <jon.johnson@chainguard.dev>
  • Loading branch information
jonjohnsonjr committed Oct 17, 2024
1 parent 808e354 commit bcb1035
Show file tree
Hide file tree
Showing 228 changed files with 32,336 additions and 8,706 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/boilerplate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Check out code
uses: actions/checkout@v4

- uses: chainguard-dev/actions/boilerplate@5e21cb47971231c078a677dfe89a348371cb880c # main
- uses: chainguard-dev/actions/boilerplate@04b3d27d680c065e8aaaa71edabf37da0ad4ac3d # main
with:
extension: ${{ matrix.extension }}
language: ${{ matrix.language }}
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
go-version: [1.19, 1.20]
go-version: [1.22, 1.23]

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bump-deps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.22
check-latest: true

- run: ./hack/bump-deps.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/donotsubmit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: chainguard-dev/actions/donotsubmit@5e21cb47971231c078a677dfe89a348371cb880c # main
- uses: chainguard-dev/actions/donotsubmit@04b3d27d680c065e8aaaa71edabf37da0ad4ac3d # main
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.22
check-latest: true

- name: crane append to an image, set the entrypoint, run it locally, roundtrip it
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ecr-auth.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.22
check-latest: true

- name: Install krane
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.22
check-latest: true

- name: Install crane
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ghcr-auth.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.22
check-latest: true

- name: Install krane
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/presubmit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.22
check-latest: true
- run: ./hack/presubmit.sh
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
run: git fetch --prune --unshallow
- uses: actions/setup-go@v5
with:
go-version: 1.21
go-version: 1.22
check-latest: true
- uses: goreleaser/goreleaser-action@v4.2.0
id: run-goreleaser
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/style.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.22
check-latest: true
- uses: actions/checkout@v4
- uses: chainguard-dev/actions/goimports@5e21cb47971231c078a677dfe89a348371cb880c # main
- uses: chainguard-dev/actions/goimports@04b3d27d680c065e8aaaa71edabf37da0ad4ac3d # main

lint:
name: Lint
Expand All @@ -25,7 +25,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.22
check-latest: true

- uses: golangci/golangci-lint-action@v3.4.0
Expand All @@ -40,10 +40,10 @@ jobs:
locale: "US"
exclude: ./vendor/*

- uses: chainguard-dev/actions/trailing-space@5e21cb47971231c078a677dfe89a348371cb880c # main
- uses: chainguard-dev/actions/trailing-space@04b3d27d680c065e8aaaa71edabf37da0ad4ac3d # main
if: ${{ always() }}

- uses: chainguard-dev/actions/eof-newline@5e21cb47971231c078a677dfe89a348371cb880c # main
- uses: chainguard-dev/actions/eof-newline@04b3d27d680c065e8aaaa71edabf37da0ad4ac3d # main
if: ${{ always() }}

- uses: get-woke/woke-action-reviewdog@v0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
test:
strategy:
matrix:
go-version: [1.19, '1.20']
go-version: [1.22, 1.23]

name: Unit Tests
runs-on: ubuntu-latest
Expand Down
16 changes: 9 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
module github.com/google/go-containerregistry

go 1.18
go 1.22.0

toolchain go1.23.0

require (
github.com/containerd/stargz-snapshotter/estargz v0.14.3
github.com/docker/cli v27.1.1+incompatible
github.com/docker/distribution v2.8.2+incompatible
github.com/docker/docker v24.0.0+incompatible
github.com/google/go-cmp v0.5.9
github.com/google/go-cmp v0.6.0
github.com/klauspost/compress v1.16.5
github.com/mitchellh/go-homedir v1.1.0
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.0-rc3
github.com/spf13/cobra v1.7.0
golang.org/x/oauth2 v0.8.0
golang.org/x/sync v0.2.0
golang.org/x/tools v0.9.1
golang.org/x/sync v0.8.0
golang.org/x/tools v0.26.0
)

require (
Expand All @@ -36,9 +38,9 @@ require (
github.com/sirupsen/logrus v1.9.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/vbatts/tar-split v0.11.3 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
Expand Down
25 changes: 13 additions & 12 deletions go.sum

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

2 changes: 1 addition & 1 deletion hack/presubmit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export PATH="${PATH}:${TMP_DIR}/bin"
export GOPATH="${TMP_DIR}"
pushd ${TMP_DIR}
trap popd EXIT
go install honnef.co/go/tools/cmd/staticcheck@v0.3.3
go install honnef.co/go/tools/cmd/staticcheck@v0.5.1
popd

pushd ${PROJECT_ROOT}
Expand Down
49 changes: 39 additions & 10 deletions vendor/github.com/google/go-cmp/cmp/cmpopts/equate.go

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

Loading

0 comments on commit bcb1035

Please sign in to comment.