Skip to content

Commit 4130229

Browse files
authored
Merge branch 'main' into fix/transport-retry-backoff-option
2 parents a138e4d + cb4a037 commit 4130229

File tree

1,088 files changed

+97507
-73727
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,088 files changed

+97507
-73727
lines changed

.github/workflows/analyze.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,17 @@ on:
77
pull_request:
88
branches: ['main']
99

10+
permissions:
11+
security-events: write
12+
actions: read
13+
contents: read
14+
1015
jobs:
1116
analyze:
1217
name: Analyze
1318
runs-on: ubuntu-latest
1419
steps:
15-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
1621
with:
1722
# We must fetch at least the immediate parents so that if this is
1823
# a pull request then we can checkout the head.

.github/workflows/boilerplate.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ jobs:
2525

2626
steps:
2727
- name: Check out code
28-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2929

30-
- uses: chainguard-dev/actions/boilerplate@5e21cb47971231c078a677dfe89a348371cb880c # main
30+
- uses: chainguard-dev/actions/boilerplate@main
3131
with:
3232
extension: ${{ matrix.extension }}
3333
language: ${{ matrix.language }}

.github/workflows/build.yaml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,11 @@ jobs:
1010
name: Build
1111
runs-on: ubuntu-latest
1212

13-
strategy:
14-
matrix:
15-
go-version: [1.19, '1.20']
16-
1713
steps:
18-
- uses: actions/checkout@v3
19-
- uses: actions/setup-go@v4
14+
- uses: actions/checkout@v4
15+
- uses: actions/setup-go@v5
2016
with:
21-
go-version: ${{ matrix.go-version }}
22-
check-latest: true
17+
go-version-file: go.mod
2318

2419
- run: |
2520
go build ./...

.github/workflows/bump-deps.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@v3
22-
- uses: actions/setup-go@v4
21+
- uses: actions/checkout@v4
22+
- uses: actions/setup-go@v5
2323
with:
24-
go-version: 1.19
25-
check-latest: true
24+
go-version-file: go.mod
2625

2726
- run: ./hack/bump-deps.sh
2827
- name: Create Pull Request

.github/workflows/donotsubmit.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v3
15-
- uses: chainguard-dev/actions/donotsubmit@5e21cb47971231c078a677dfe89a348371cb880c # main
14+
- uses: actions/checkout@v4
15+
- uses: chainguard-dev/actions/donotsubmit@main

.github/workflows/e2e.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@ jobs:
1616
runs-on: ${{ matrix.platform }}
1717

1818
steps:
19-
- uses: actions/checkout@v3
20-
- uses: actions/setup-go@v4
19+
- uses: actions/checkout@v4
20+
- uses: actions/setup-go@v5
2121
with:
22-
go-version: 1.19
23-
check-latest: true
22+
go-version-file: go.mod
2423

2524
- name: crane append to an image, set the entrypoint, run it locally, roundtrip it
2625
shell: bash
@@ -29,6 +28,7 @@ jobs:
2928
3029
# Setup local registry
3130
go run ./cmd/registry &
31+
sleep 3
3232
3333
base=alpine
3434
platform=linux/amd64
@@ -82,13 +82,13 @@ jobs:
8282
./app/crane pull --platform=linux/arm64 --format=oci $remote $distroless
8383
./app/crane push $distroless $local
8484
diff <(./app/crane manifest --platform linux/arm64 $remote) <(./app/crane manifest $local)
85-
85+
8686
- name: crane pull image, and export it from stdin to filesystem tar to stdout
8787
shell: bash
8888
run: |
8989
set -euxo pipefail
90-
90+
9191
./app/crane pull ubuntu ubuntu.tar
9292
./app/crane export - - < ubuntu.tar > filesystem.tar
9393
ls -la *.tar
94-
94+

.github/workflows/ecr-auth.yaml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ jobs:
1818
AWS_REGION: us-east-2
1919

2020
steps:
21-
- uses: actions/checkout@v3
22-
- uses: actions/setup-go@v4
21+
- uses: actions/checkout@v4
22+
- uses: actions/setup-go@v5
2323
with:
24-
go-version: 1.19
25-
check-latest: true
24+
go-version-file: go.mod
2625

2726
- name: Install krane
2827
working-directory: ./cmd/krane
@@ -58,11 +57,10 @@ jobs:
5857
AWS_REGION: us-east-2
5958

6059
steps:
61-
- uses: actions/checkout@v3
62-
- uses: actions/setup-go@v4
60+
- uses: actions/checkout@v4
61+
- uses: actions/setup-go@v5
6362
with:
64-
go-version: 1.19
65-
check-latest: true
63+
go-version-file: go.mod
6664

6765
- name: Install crane
6866
working-directory: ./cmd/crane

.github/workflows/ghcr-auth.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ jobs:
1414
krane:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v3
18-
- uses: actions/setup-go@v4
17+
- uses: actions/checkout@v4
18+
- uses: actions/setup-go@v5
1919
with:
20-
go-version: 1.19
21-
check-latest: true
20+
go-version-file: go.mod
2221

2322
- name: Install krane
2423
working-directory: ./cmd/krane
@@ -44,4 +43,4 @@ jobs:
4443
if [[ "$CRED1" == "$CRED2" ]] ; then
4544
echo "credentials are cached by infrastructure"
4645
fi
47-
46+

.github/workflows/presubmit.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ jobs:
2626
runs-on: 'ubuntu-latest'
2727

2828
steps:
29-
- uses: actions/checkout@v3
30-
- uses: actions/setup-go@v4
29+
- uses: actions/checkout@v4
30+
- uses: actions/setup-go@v5
3131
with:
32-
go-version: 1.19
33-
check-latest: true
32+
go-version-file: go.mod
3433
- run: ./hack/presubmit.sh

.github/workflows/release.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@ on:
66

77
jobs:
88
goreleaser:
9+
permissions:
10+
contents: write
911
runs-on: ubuntu-latest
1012
outputs:
1113
hashes: ${{ steps.hash.outputs.hashes }}
1214
steps:
13-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1416
- name: Unshallow
1517
run: git fetch --prune --unshallow
16-
- uses: actions/setup-go@v4
18+
- uses: actions/setup-go@v5
1719
with:
1820
go-version: 1.21
1921
check-latest: true
@@ -40,7 +42,7 @@ jobs:
4042
actions: read # To read the workflow path.
4143
id-token: write # To sign the provenance.
4244
contents: write # To add assets to a release.
43-
uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v1.5.0
45+
uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v2.1.0
4446
with:
4547
base64-subjects: "${{ needs.goreleaser.outputs.hashes }}"
4648
upload-assets: true # upload to a new release
@@ -51,7 +53,7 @@ jobs:
5153
permissions: read-all
5254
steps:
5355
- name: Install SLSA verifier
54-
uses: slsa-framework/slsa-verifier/actions/installer@v2.2.0
56+
uses: slsa-framework/slsa-verifier/actions/installer@v2.7.0
5557
- name: Download assets
5658
env:
5759
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)