Skip to content

Commit

Permalink
Merge branch 'notaryproject:main' into notaryprojectgh-549/improve-pl…
Browse files Browse the repository at this point in the history
…ugin-installation-ux
  • Loading branch information
duffney authored Mar 30, 2023
2 parents c4a66ad + 0ec3b3d commit 7ff7870
Show file tree
Hide file tree
Showing 49 changed files with 1,505 additions and 320 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-or-issue.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ body:
- type: markdown
attributes:
value: |
If you want to contribute to this project, we will be happy to guide you through out contribution process especially when you already have a good proposal or understanding of how to fix this issue. Join us at https://slack.cncf.io/ and choose #notary-v2 channel.
If you want to contribute to this project, we will be happy to guide you through out contribution process especially when you already have a good proposal or understanding of how to fix this issue. Join us at https://slack.cncf.io/ and choose #notary-project channel.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ blank_issues_enabled: false
contact_links:
- name: Ask a question
url: https://slack.cncf.io/
about: "Join #notary-v2 channel on CNCF Slack"
about: "Join #notary-project channel on CNCF Slack"
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ body:
- type: markdown
attributes:
value: |
If you want to contribute to this project, we will be happy to guide you through out contribution process especially when you already have a good proposal or understanding of how to imrpove the functionality. Join us at https://slack.cncf.io/ and choose #notary-v2 channel.
If you want to contribute to this project, we will be happy to guide you through out contribution process especially when you already have a good proposal or understanding of how to imrpove the functionality. Join us at https://slack.cncf.io/ and choose #notary-project channel.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: true
steps:
- name: Set up Go ${{ matrix.go-version }}
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
- name: Check out code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3
- name: Set up Go ${{ matrix.go-version }} environment
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
check-latest: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dev-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: true
steps:
- name: Set up Go ${{ matrix.go-version }}
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: true
steps:
- name: Set up Go ${{ matrix.go-version }}
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
- name: Checkout
Expand Down
4 changes: 3 additions & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
* @notaryproject/notation-maintainers
# Repo-Level Owners (in alphabetical order)
# Note: This is only for the notaryproject/notation repo
* @gokarnm @JeyJeyGao @justincormack @niazfk @patrickzheng200 @priteshbandi @rgnote @shizhMSFT @stevelasker
95 changes: 0 additions & 95 deletions CONTRIBUTING.md

This file was deleted.

14 changes: 14 additions & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Org-Level Maintainers (in alphabetical order)
# Pattern: [First Name] [Last Name] <[Email Address]> ([GitHub Handle])
Justin Cormack <[email protected]> (@justincormack)
Niaz Khan <[email protected]> (@niazfk)
Steve Lasker <[email protected]> (@stevelasker)

# Repo-Level Maintainers (in alphabetical order)
# Note: This is for the notaryproject/notation repo
Junjie Gao <[email protected]> (@JeyJeyGao)
Milind Gokarn <[email protected]> (@gokarnm)
Patrick Zheng <[email protected]> (@patrickzheng200)
Pritesh Bandi <[email protected]> (@priteshbandi)
Rakesh Gariganti <[email protected]> (@rgnote)
Shiwei Zhang <[email protected]> (@shizhMSFT)
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
[![codecov](https://codecov.io/gh/notaryproject/notation/branch/main/graph/badge.svg)](https://codecov.io/gh/notaryproject/notation)
[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/notaryproject/notation/badge)](https://api.securityscorecards.dev/projects/github.com/notaryproject/notation)

Notation is a CLI project to add signatures as standard items in the registry ecosystem, and to build a set of simple tooling for signing and verifying these signatures. This should be viewed as similar security to checking git commit signatures, although the signatures are generic and can be used for additional purposes. Notation is an implementation of the [Notary v2 specifications][notaryv2-specs].
Notation is a CLI project to add signatures as standard items in the registry ecosystem, and to build a set of simple tooling for signing and verifying these signatures. This should be viewed as similar security to checking git commit signatures, although the signatures are generic and can be used for additional purposes. Notation is an implementation of the [Notary project specifications][notaryv2-specs].

## Table of Contents

- [Documents](#documents)
- [Community](#community)
- [Development and Contributing](#development-and-contributing)
- [Notary v2 Community Meeting](#notary-v2-community-meeting)
- [Notary project Community Meeting](#notary-project-community-meeting)
- [Release Management](#release-management)
- [Support](#support)
- [Code of Conduct](#code-of-conduct)
Expand All @@ -27,14 +27,14 @@ Notation is a CLI project to add signatures as standard items in the registry ec
### Development and Contributing

- [Build Notation from source code](/building.md)
- [Governance for Notation](https://github.com/notaryproject/notary/blob/master/GOVERNANCE.md)
- [Maintainers and reviewers list](https://github.com/notaryproject/notary/blob/master/MAINTAINERS)
- Regular conversations for Notation occur on the [Cloud Native Computing Slack](https://slack.cncf.io/) **notary-v2** channel.
- [Governance for Notation](https://github.com/notaryproject/.github/blob/master/GOVERNANCE.md)
- [Maintainers and reviewers list](https://github.com/notaryproject/notation/blob/main/CODEOWNERS)
- Regular conversations for Notation occur on the [Cloud Native Computing Slack](https://slack.cncf.io/) **notary-project** channel.

### Notary v2 Community Meeting
### Notary project Community Meeting

- Mondays 5-6 PM Pacific time, 8-9 PM US Eastern, 8-9 AM Shanghai
- Thursdays 9-10 AM Pacific time, 12 PM US Eastern, 5 PM UK
- Mondays 5-6 PM PDT, 4-5 PM PST, 8-9 PM EDT, 7-8 PM EST, 8-9 AM Shanghai
- Thursdays 9-10 AM PDT, 8-9 AM PST, 12 PM EDT, 11 AM EST, 5 PM UK

Join us at [Zoom Dial-in link](https://zoom.us/my/cncfnotaryproject) / Passcode: 77777. Please see the [CNCF Calendar](https://www.cncf.io/calendar/) for community meeting details. Meeting notes are captured on [hackmd.io](https://hackmd.io/_vrqBGAOSUC_VWvFzWruZw).

Expand Down
Loading

0 comments on commit 7ff7870

Please sign in to comment.