Skip to content

Commit

Permalink
Merge branch 'main' into lumjjb-patch-8
Browse files Browse the repository at this point in the history
  • Loading branch information
TheFoxAtWork authored Jun 16, 2021
2 parents 89a5de8 + 171eec9 commit 37932f8
Show file tree
Hide file tree
Showing 42 changed files with 865 additions and 799 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/joint-review.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ assignees: ''

---

Project Name:
Project Name:

Github URL:

<!-- For project proposals looking to go through SIG review, please indicate the stage of the project (sandbox, incubation/graduation and link to the TOC issue, else indicate NA
<!-- For project proposals looking to go through TAG review, please indicate the stage of the project (sandbox, incubation/graduation and link to the TOC issue, else indicate NA
For example, https://github.com/cncf/toc/issues/368 (incubation)
-->
Expand All @@ -27,7 +27,7 @@ Security Provider: yes/no (e.g. Is the primary function of the project to suppor
- [ ] Sign off by 2 chairs on reviewer conflicts
- [ ] Create slack channel (e.g. #sec-assess-projectname)
- [ ] Project lead provides draft document - see [outline](https://github.com/cncf/tag-security/blob/main/assessments/guide/joint-review.md)
- [ ] "Naive question phase" Lead Security Reviewer asks clarifying questions
- [ ] "Naive question phase" Lead Security Reviewer asks clarifying questions
- [ ] Assign issue to security reviewers
- [ ] Initial review
- [ ] Presentation & discussion
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/presentation.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Presentation
about: Have something you want to share with the group? Or someone you would like to invite to speak? Propose a presentation for the SIG-Security weekly meetings.
about: Have something you want to share with the group? Or someone you would like to invite to speak? Propose a presentation for the TAG-Security weekly meetings.
title: "[Presentation] Presentation Title"
labels: "usecase-presentation, triage-required"
assignees: ''
Expand All @@ -14,7 +14,7 @@ Description: Describe in a short paragraph what the presentation is about.

Time: How long will the presentation take? (estimate)

Availability: What is the availability times of the speakers to present the topic? Meeting times are listed on the landing page.
Availability: What is the availability times of the speakers to present the topic? Meeting times are listed on the landing page.

TO DO
- [ ] TAG Representative
Expand Down
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/proposal.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ assignees: ''

---

Description: what's your idea?
Description: what's your idea?

Impact: Describe the customer impact of the problem. Who will this help? How will it help them?

Scope: How much effort will this take? ok to provide a range of options if or "not yet determined" for initial proposals. Feel free to include proposed tasks below or link a Google doc
Scope: How much effort will this take? ok to provide a range of options if or "not yet determined" for initial proposals. Feel free to include proposed tasks below or link a Google doc

TO DO
- [ ] Security TAG Leadership Representative:
Expand All @@ -26,3 +26,4 @@ TO DO
- [ ] Meeting Notes (link)
- [ ] Meeting Details (zoom or hangouts link)
- [ ] Retrospective

6 changes: 3 additions & 3 deletions .github/workflows/sig-sec-check.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
name: SIG-Security-Linter
name: TAG-Security-Linter

# Run this workflow on every PR to master
# Run this workflow on every PR to main
on:
pull_request:
branches:
- master
- main

jobs:
Setup:
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ review/comment.

A favorable review is determined by the contents of the PR complying with the
contributing guide, the writing style, and agreement the contents align with the
SIG's goals, objectives, and scope. It is anticipated that PRs submitted, with
TAG's goals, objectives, and scope. It is anticipated that PRs submitted, with
the exception of spelling and grammar changes, have been discussed with members
of the SIG via slack or issues.
of the TAG via slack or issues.

##### Nits

Expand Down Expand Up @@ -99,7 +99,7 @@ merging party.

### Merging pull requiests

PRs may be merged after at least one review as occurred, dependent on the type of changes reflected in the PR. The merging party needs to verify a review has occurred, the PR is in alignment with this guide, and is in scope of the SIG.
PRs may be merged after at least one review as occurred, dependent on the type of changes reflected in the PR. The merging party needs to verify a review has occurred, the PR is in alignment with this guide, and is in scope of the TAG.

### Writing style

Expand Down
Loading

0 comments on commit 37932f8

Please sign in to comment.