Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for Go and cloud-sql-connectors/cloud-sql-proxy #1102

Merged
merged 2 commits into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/add-remove-new-fulcio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
- fulcio-key-rotation

go-version:
- 1.21.x
- 1.22.x

env:
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/fulcio-rekor-kind.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
- fulcio rekor ctlog e2e

go-version:
- 1.21.x
- 1.22.x

env:
Expand All @@ -46,6 +45,11 @@ jobs:
COSIGN_EXPERIMENTAL: true

steps:
- name: Check out our repo
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
with:
path: ./src/github.com/sigstore/scaffolding

- uses: chainguard-dev/actions/setup-mirror@main
# https://github.com/mvdan/github-actions-golang#how-do-i-set-up-caching-between-builds

Expand All @@ -55,11 +59,6 @@ jobs:
go-version: ${{ matrix.go-version }}
check-latest: true

- name: Check out our repo
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
with:
path: ./src/github.com/sigstore/scaffolding

- uses: actions/cache@v4
with:
# In order:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prober-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: '1.21'
go-version: '1.22'
check-latest: true

- name: Prober test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
steps:
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: '1.21'
go-version: '1.22'
check-latest: true

- name: Install ko
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-action-tuf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ jobs:
release-version:
- "main" # Test explicitly with latest
go-version:
- 1.21.x
- 1.22.x
leg:
- test github action with TUF
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ jobs:
leg:
- fulcio rekor ctlog e2e
go-version:
- 1.21.x
- 1.22.x

env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: '1.21'
go-version: '1.22'
check-latest: true
cache: true

Expand Down Expand Up @@ -46,11 +46,11 @@ jobs:

- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: '1.21'
go-version: '1.22'
check-latest: true

- name: golangci-lint
uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
version: v1.57
version: v1.58
2 changes: 1 addition & 1 deletion .ko.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
defaultBaseImage: gcr.io/distroless/static-debian12:nonroot
baseImageOverrides:
github.com/sigstore/scaffolding/cmd/cloudsqlproxy: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.10.1-alpine
github.com/sigstore/scaffolding/cmd/cloudsqlproxy: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.10.2-alpine

builds:
- id: ctlog-createctconfig
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.deps
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
# !!!!!!!!!!!!!!
#
# If dependabot proposes an update to the container listed below, you should also update the value listed in '.ko.yaml' and cut a new release of scaffolding
FROM gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.11.0-alpine as cloud-sql-proxy
FROM gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.11.2-alpine as cloud-sql-proxy
ENV FOO=BAR
Loading