Skip to content

Commit b12586e

Browse files
authored
Merge branch 'CodeYourFuture:main' into feature/form-controls
2 parents 2ba6397 + 72fe02b commit b12586e

7 files changed

Lines changed: 39 additions & 94 deletions

File tree

.github/FUNDING.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,2 @@
1-
# These are supported funding model platforms
2-
31
github: CodeYourFuture
4-
patreon: # Replace with a single Patreon username
5-
open_collective: # Replace with a single Open Collective username
6-
ko_fi: # Replace with a single Ko-fi username
7-
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8-
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9-
liberapay: # Replace with a single Liberapay username
10-
issuehunt: # Replace with a single IssueHunt username
11-
otechie: # Replace with a single Otechie username
12-
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
132
custom: https://codeyourfuture.io/donate

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
blank_issues_enabled: false
1+
blank_issues_enabled: true
22
contact_links:
33
- name: CYF
44
url: contact@codeyourfuture.io
@@ -8,7 +8,7 @@ contact_links:
88
about: Join CYF here
99
- name: CYF Slack
1010
url: codeyourfuture.slack.com
11-
about: Come to #cyf-syllabus-tech and chat
11+
about: Come to #cyf-curriculum and chat
1212
- name: CYF Tech Ed
1313
url: https://github.com/orgs/CodeYourFuture/teams/mentors
1414
about: CYF mentors on Github

.github/ISSUE_TEMPLATE/pd-assignment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: PD Coursework
22
description: Assign a piece of PD coursework
33
title: "[PD] <title>"
4-
labels: [PD, 🏝 Priority Stretch, 🐇 Size Small]
4+
labels: [PD, 🏝 Priority Stretch, 🐇 Size Small, 📅 Sprint 1]
55
body:
66
- type: markdown
77
attributes:

.github/ISSUE_TEMPLATE/tech-ed-assignment.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
name: Tech Ed Coursework
22
description: Assign a piece of technical coursework
33
title: "<title>"
4-
labels: [Tech Ed, 🏕 Priority Mandatory, 🐂 Size Medium, 📅 Module 1]
4+
labels: [Tech Ed, 🏕 Priority Mandatory, 🐂 Size Medium, 📅 Sprint 1]
55
body:
66
- type: markdown
77
attributes:
88
value: |
9-
Thanks for taking the time to assign this coursework!
9+
Thanks for taking the time to assign this coursework!
1010
11-
To support our trainees with planning and prioritising their own learning journey, we want our coursework assignments to be more informative.
11+
To support our trainees with planning and prioritising their own learning journey, we want our coursework assignments to be more informative.
1212
We don't just want to tell them what to do, we want to tell them stuff like:
1313
- why we are doing it
1414
- what it's "for" (problem-solving, debugging, etc)
1515
- how long they should spend on it, maximum
16-
- how to get help
17-
- how to review it with answers
16+
- how to get help
17+
- how to review it with answers
1818
- how to get it reviewed from mentors and peers
1919
- type: input
2020
attributes:
@@ -26,7 +26,7 @@ body:
2626
label: Learning Objectives
2727
description: https://common.codeyourfuture.io/common-theme/shortcodes/objectives/
2828
placeholder: |
29-
<!--{{<objectives}}-->
29+
<!--{{<objectives}}-->
3030
- [ ] CYF format, task list formatting
3131
<!--{{</objectives}}-->
3232
- type: textarea
@@ -80,7 +80,7 @@ body:
8080
1. Update labels
8181
- priority -- is this coursework key, mandatory, or stretch? Pick one.
8282
- size -- help trainees plan their time with rough estimation. Pick one
83-
- topics -- add all that seem relevant to you.
83+
- topics -- add all that seem relevant to you.
8484
2. Add a Sprint label to add to the backlog view
8585
- sprint 1,2,3,4
8686

.github/pull_request_template.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,30 @@
22
33
You must title your PR like this:
44
5-
REGION | COHORT_NAME | FIRST_NAME LAST_NAME | PROJ_NAME
5+
Region | Cohort | FirstName LastName | Sprint | Assignment Title
66
77
For example,
88
9-
London | May-2025 | Carol Owen | Wireframe
9+
London | 25-ITP-May | Carol Owen | Sprint 1 | Alarm Clock
1010
11-
Complete the task list below this message.
12-
If your PR is rejected, check the task list.
11+
Fill in the template below - remove any sections that don't apply.
12+
13+
Complete the self checklist - replace each empty box in the checklist [ ] with a [x].
14+
15+
Add the label "Needs Review" and you will get review.
16+
17+
Respond to volunteer reviews until the volunteer marks it as "Complete".
1318
1419
-->
1520

1621
## Learners, PR Template
1722

1823
Self checklist
1924

20-
- [ ] I have committed my files one by one, on purpose, and for a reason
21-
- [ ] I have titled my PR with REGION | COHORT_NAME | FIRST_NAME LAST_NAME | PROJ_NAME
25+
- [ ] I have titled my PR with Region | Cohort | FirstName LastName | Sprint | Assignment Title
26+
- [ ] My changes meet the requirements of the task
2227
- [ ] I have tested my changes
2328
- [ ] My changes follow the [style guide](https://curriculum.codeyourfuture.io/guides/reviewing/style-guide/)
24-
- [ ] My changes meet the [requirements](./README.md) of this task
2529

2630
## Changelist
2731

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Validate PR Metadata
2+
on:
3+
pull_request_target:
4+
types:
5+
- labeled
6+
- unlabeled
7+
- opened
8+
- edited
9+
- reopened
10+
11+
jobs:
12+
validate_pr_metadata:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v4
16+
- uses: CodeYourFuture/actions/validate-pr-metadata@main
17+
with:
18+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

HOW_TO_REVIEW.md

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)