Merge branch 'main' into multiple-tag-push

Signed-off-by: Jeff <jscarter3@gmail.com>

Author: jcarter3

.github/workflows/build-pr.yml

@@ -11,14 +11,14 @@ jobs:
 
     strategy:
       matrix:
-        go: ['1.18', '1.19', '1.20']
+        go: ['1.21', '1.22']
 
     steps:
       - name: checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: setup go environment
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go }}
 
@@ -43,7 +43,7 @@ jobs:
 
       - name: Upload OCI conformance results as build artifact
         if: always() && steps.tests.outputs.has-report == 'true'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: oci-conformance-results-${{ matrix.go }}
           path: |

.github/workflows/build.yml

@@ -11,14 +11,14 @@ jobs:
 
     strategy:
       matrix:
-        go: ['1.18', '1.19', '1.20']
+        go: ['1.21', '1.22']
 
     steps:
       - name: checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: setup go environment
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go }}
 
@@ -43,7 +43,7 @@ jobs:
 
       - name: Upload OCI conformance results as build artifact
         if: always() && steps.tests.outputs.has-report == 'true'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: oci-conformance-results-${{ matrix.go }}
           path: |

.github/workflows/conformance-action-pr.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Start a test registry (zot)
         run: |
           set -x

.github/workflows/conformance-action.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Start a test registry (zot)
         run: |
           set -x

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Prepare
         id: prepare
@@ -35,20 +35,20 @@ jobs:
             MAJOR=${MINOR%.*}
             TAGS="${TAGS},${IMAGE}:${MINOR},${IMAGE}:${MAJOR}"
           fi
-          echo ::set-output name=version::${VERSION}
-          echo ::set-output name=tags::${TAGS}
-          echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+          echo "version=${VERSION}" >>$GITHUB_OUTPUT
+          echo "tags=${TAGS}" >>$GITHUB_OUTPUT
+          echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >>$GITHUB_OUTPUT
 
       - name: Docker Login
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.repository_owner == 'opencontainers'
         with:
           registry: ghcr.io
           username: ${{ secrets.GHCR_USER }}
           password: ${{ secrets.GHCR_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: conformance/
           # platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x

.gitignore

@@ -3,7 +3,6 @@
 output
 header.html
 tags
-go.mod
-go.sum
+go.work
 junit.xml
 report.html

.tool/go.mod

@@ -2,4 +2,4 @@ module github.com/opencontainers/distribution-spec/.tool
 
 go 1.15
 
-require github.com/opencontainers/distribution-spec/specs-go v0.0.0-20210623213441-eb171947459c // indirect
+require github.com/opencontainers/distribution-spec/specs-go v0.0.0-20260313153622-5e57cc0a07ea

.tool/go.sum

@@ -0,0 +1,4 @@
+github.com/opencontainers/distribution-spec/specs-go v0.0.0-20210623213441-eb171947459c h1:7zh9TklTB1x95V7yygkuKSdBlgsCjQvamWTEKPkK80o=
+github.com/opencontainers/distribution-spec/specs-go v0.0.0-20210623213441-eb171947459c/go.mod h1:aA4vdXRS8E1TG7pLZOz85InHi3BiPdErh8IpJN6E0x4=
+github.com/opencontainers/distribution-spec/specs-go v0.0.0-20260313153622-5e57cc0a07ea h1:2gucIpEeV3BzUKWXcLuDAYKPnPcVwVBi+f63IS2WBQA=
+github.com/opencontainers/distribution-spec/specs-go v0.0.0-20260313153622-5e57cc0a07ea/go.mod h1:Va0IMqkjv62YSEytL4sgxrkiD9IzU0T0bX/ZZEtMnSQ=

CODEOWNERS

@@ -1 +1 @@
-* @dmcgowan @jzelinskie @jonjohnsonjr @jdolitsky @mikebrow @stevvooe @sudo-bmitch @vbatts
+* @dmcgowan @jzelinskie @jonjohnsonjr @jdolitsky @mikebrow @stevvooe @sudo-bmitch

EMERITUS.md

@@ -0,0 +1,7 @@
+# Emeritus
+
+We would like to acknowledge previous OCI distribution spec maintainers and their huge contributions to our collective success:
+
+- Vincent Batts (@vbatts)
+
+We thank these members for their service to the OCI community.