Skip to content

Commit

Permalink
chore: Bump OCI workflows to v1.1.0-rc.3
Browse files Browse the repository at this point in the history
Signed-off-by: jay-dee7 <[email protected]>
  • Loading branch information
jay-dee7 committed Nov 17, 2023
1 parent 4b1b835 commit 5ae8601
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/oci-dist-spec-content-discovery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
run: |
git clone https://github.com/opencontainers/distribution-spec.git
pushd distribution-spec/conformance
git checkout v1.1.0-rc.2
git checkout v1.1.0-rc.3
go test -c
./conformance.test
popd
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/oci-dist-spec-content-management.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
run: |
git clone https://github.com/opencontainers/distribution-spec.git
pushd distribution-spec/conformance
git checkout v1.1.0-rc.2
git checkout v1.1.0-rc.3
go test -c
./conformance.test
popd
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/oci-dist-spec-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
run: |
git clone https://github.com/opencontainers/distribution-spec.git
pushd distribution-spec/conformance
git checkout v1.1.0-rc.2
git checkout v1.1.0-rc.3
go test -c
./conformance.test
popd
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/oci-dist-spec-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
cd ../
git clone https://github.com/opencontainers/distribution-spec.git
pushd distribution-spec/conformance
git checkout v1.1.0-rc.2
git checkout v1.1.0-rc.3
go test -c
./conformance.test
popd
Expand Down
11 changes: 1 addition & 10 deletions store/v2/registry/registry_impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package registry
import (
"context"
"database/sql"
"encoding/json"
"fmt"
"strings"
"time"
Expand Down Expand Up @@ -600,12 +599,6 @@ func (s *registryStore) GetReferrers(
})

if len(artifactTypes) > 0 {
color.Yellow("ArtifactType: %s", artifactTypes)

var mfl []*types.ImageManifest
s.db.NewSelect().Model(&mfl).Scan(ctx)
bz, _ := json.MarshalIndent(mfl, "", "\t")
color.Green("Available manifests: \n%s", bz)
// q.
// WhereOr("artifact_type IN (?)", bun.In(artifactTypes)).
// WhereOr("COALESCE(artifact_type, '') = '' AND config_media_type IN (?)", bun.In(artifactTypes))
Expand All @@ -629,7 +622,7 @@ func (s *registryStore) GetReferrers(
})

if err := q.Scan(ctx); err != nil {
return imgIndex, nil
return imgIndex, err
}

// q := s.
Expand Down Expand Up @@ -783,9 +776,7 @@ func (s *registryStore) GetReferrers(
}

func (s *registryStore) descriptorFound(descriptors []img_spec_v1.Descriptor, digest string) bool {
color.Yellow("total descriptors: %d", len(descriptors))
for _, d := range descriptors {
color.Yellow("d.digest=%s - digest=%s - matched: %v", d.Digest.String(), digest, d.Digest.String() == digest)
if d.Digest.String() == digest {
return true
}
Expand Down

0 comments on commit 5ae8601

Please sign in to comment.