Skip to content

Commit cfdda44

Browse files
authored
Merge branch 'main' into fall-orascp
2 parents 83937df + e456403 commit cfdda44

File tree

18 files changed

+60
-25
lines changed

18 files changed

+60
-25
lines changed

.github/workflows/release-github.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ jobs:
2929
- name: setup go environment
3030
uses: actions/setup-go@v6
3131
with:
32-
go-version: '1.25.0'
32+
go-version: '1.25.4'
33+
- name: Install Syft
34+
uses: anchore/sbom-action/download-syft@v0.20.11
35+
with:
36+
syft-version: v1.32.0
3337
- name: run goreleaser
3438
uses: goreleaser/goreleaser-action@v6
3539
with:

.golangci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ linters:
2929
enable:
3030
- depguard
3131
- dupl
32+
- goheader
3233
- gomodguard
3334
- govet
3435
- ineffassign
@@ -64,6 +65,9 @@ linters:
6465
dupl:
6566
threshold: 400
6667

68+
goheader:
69+
template-path: copyright.tmpl
70+
6771
run:
6872
timeout: 10m
6973

.goreleaser.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ archives:
6868
- goos: windows
6969
format: zip
7070

71+
sboms:
72+
- artifacts: archive
73+
7174
release:
7275
draft: true
7376
prerelease: auto

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Derived from OWNERS.md
2-
* @sajayantony @shizhMSFT @stevelasker @qweeah @Wwwsylvia @TerryHowe
2+
* @sajayantony @shizhMSFT @Wwwsylvia @TerryHowe

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# See the License for the specific language governing permissions and
1212
# limitations under the License.
1313

14-
FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.25.4-alpine as builder
14+
FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.25.5-alpine as builder
1515
ARG TARGETPLATFORM
1616
RUN apk add git make
1717
ENV ORASPKG /oras

OWNERS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
Owners:
44
- Sajay Antony (@sajayantony)
55
- Shiwei Zhang (@shizhMSFT)
6-
- Steve Lasker (@stevelasker)
76
- Terry Howe (@TerryHowe)
87

98
Emeritus:
109
- Avi Deitcher (@deitch)
1110
- Jimmy Zelinskie (@jzelinskie)
1211
- Josh Dolitsky (@jdolitsky)
12+
- Steve Lasker (@stevelasker)
1313
- Vincent Batts (@vbatts)

cmd/oras/internal/display/metadata/text/manifest_delete.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ Copyright The ORAS Authors.
33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.
55
You may obtain a copy of the License at
6+
67
http://www.apache.org/licenses/LICENSE-2.0
8+
79
Unless required by applicable law or agreed to in writing, software
810
distributed under the License is distributed on an "AS IS" BASIS,
911
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

cmd/oras/internal/display/metadata/text/tag_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ Copyright The ORAS Authors.
33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.
55
You may obtain a copy of the License at
6+
67
http://www.apache.org/licenses/LICENSE-2.0
8+
79
Unless required by applicable law or agreed to in writing, software
810
distributed under the License is distributed on an "AS IS" BASIS,
911
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

cmd/oras/internal/option/platform_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ Copyright The ORAS Authors.
33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.
55
You may obtain a copy of the License at
6+
67
http://www.apache.org/licenses/LICENSE-2.0
8+
79
Unless required by applicable law or agreed to in writing, software
810
distributed under the License is distributed on an "AS IS" BASIS,
911
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

cmd/oras/root/manifest/index/cmd.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ Copyright The ORAS Authors.
33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.
55
You may obtain a copy of the License at
6+
67
http://www.apache.org/licenses/LICENSE-2.0
8+
79
Unless required by applicable law or agreed to in writing, software
810
distributed under the License is distributed on an "AS IS" BASIS,
911
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

0 commit comments

Comments
 (0)