Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 7 additions & 7 deletions .github/scripts/comment-responder.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ function getAutoResponse(commentBody, author) {
const comment = (commentBody || '').toLowerCase();
const safeAuthor = author || 'contributor';

if (comment.includes('@aria-bot') || comment.includes('@bot help') || comment.includes('need help')) {
if (comment.includes('@aria-bot') || comment.includes('@gandalf-bot') || comment.includes('@bot help') || comment.includes('need help')) {
return [
`Hi @${safeAuthor}! I am Aria, your workshop agent. I see you are looking for help. That is exactly what I am here for. Here are some resources to get you unstuck:`,
`Hi @${safeAuthor}! I am Gandalf, your workshop agent. I bring a little magic to make this interaction experience clear, useful, and fun. I see you are looking for help, and that is exactly what I am here for. Here are some resources to get you unstuck:`,
'',
'**Guides:**',
'- [Working with Pull Requests](../../docs/05-working-with-pull-requests.md)',
Expand All @@ -25,9 +25,9 @@ function getAutoResponse(commentBody, author) {
].join('\n');
}

if (comment.includes('merge conflict') || (comment.includes('@aria-bot') && comment.includes('conflict'))) {
if (comment.includes('merge conflict') || ((comment.includes('@aria-bot') || comment.includes('@gandalf-bot')) && comment.includes('conflict'))) {
return [
`Hi @${safeAuthor}! I am Aria. I see you want to learn about merge conflicts. They can seem intimidating at first, but resolving them is a normal developer skill. Let us walk through it together.`,
`Hi @${safeAuthor}! I am Gandalf. I see you want to learn about merge conflicts. They can seem intimidating at first, but resolving them is a normal developer skill. Let us walk through it together.`,
'',
'**Quick steps to resolve:**',
'',
Expand All @@ -44,9 +44,9 @@ function getAutoResponse(commentBody, author) {
].join('\n');
}

if (comment.includes('@aria-bot') && (comment.includes('check') || comment.includes('review'))) {
if ((comment.includes('@aria-bot') || comment.includes('@gandalf-bot')) && (comment.includes('check') || comment.includes('review'))) {
return [
`Hi @${safeAuthor}! Aria here. I see you want me to check your work.`,
`Hi @${safeAuthor}! Gandalf here. I see you want me to check your work.`,
'',
'- **If you are on an Issue:** Great job practice @mentions! Next, head to Challenge 4 to start branching.',
'- **If you are on a Pull Request:** I am already scanning your changes! Look for my "Validation Report" above. If you do not see it, wait a few seconds and refresh.',
Expand All @@ -57,7 +57,7 @@ function getAutoResponse(commentBody, author) {

if (comment.includes('how do i') && comment.includes('request review')) {
return [
`Hi @${safeAuthor}! Aria here. To request a review, use the reviewer controls on your pull request. Here is exactly how to do it:`,
`Hi @${safeAuthor}! Gandalf here. To request a review, use the reviewer controls on your pull request. Here is exactly how to do it:`,
'',
'1. On your PR page, find the "Reviewers" section in the right sidebar',
'2. Click the gear icon next to "Reviewers"',
Expand Down
4 changes: 2 additions & 2 deletions .github/scripts/validation-report.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function buildValidationReportBody(results, timestampIso) {
? "**Validation Passed** [PASS]"
: "**Validation Needs Attention** [ACTION REQUIRED]";

let body = `Hi! I am Aria. Here is my review of your pull request:\n\n### Report Status\n${status}\n\n`;
let body = `Hi! I am Gandalf, your workshop agent. I bring a little magic to make this interaction clear, helpful, and fun. Here is my review of your pull request:\n\n### Report Status\n${status}\n\n`;

if (safeResults.passed) {
body += `> Great job. Your pull request has the structure reviewers expect.\n> When your challenge issue is complete, close it to unlock the next challenge.\n\n`;
Expand Down Expand Up @@ -68,7 +68,7 @@ function buildValidationReportBody(results, timestampIso) {
});

body += "\n---\n";
body += `*Automated validation by Learning Room Bot. Aria generated this review. Last updated: ${ts}*\n`;
body += `*Automated validation by Learning Room Bot. Gandalf generated this review. Last updated: ${ts}*\n`;
body += "*Questions? Check [PR Guidelines](../../docs/06-working-with-pull-requests.md) or mention @facilitator*";
return body;
}
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/learning-room-pr-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,17 @@ jobs:

if (firstIssue) {
const welcomeBody = [
'## Workspace Agent Aria: Welcome to Your First Issue',
'## Workspace Agent Gandalf: Welcome to Your First Issue',
'',
'Hi @' + context.payload.issue.user.login + '! I am Aria. Great job successfully opening an Issue!',
'Hi @' + context.payload.issue.user.login + '! I am Gandalf. Great job successfully opening an Issue!',
'',
'I am here to bring a little magic to the interaction experience and keep this learning journey fun while you build real skills.',
'',
'Remember, a good Issue for a human is also a perfect **prompt** for an AI. By carefully describing the problem here, you are already practicing how to command your custom Capstone Agent tomorrow!',
'',
'Keep up the great work!',
'---',
'*This is an automated message from Aria, your Workshop Agent.*'
'*This is an automated message from Gandalf, your Workshop Agent.*'
].join('\n');

await github.rest.issues.createComment({
Expand Down Expand Up @@ -106,7 +108,7 @@ jobs:
'**Remember:** Every experienced contributor started exactly where you are now. Questions are welcome!',
'',
'---',
'*This is an automated message from the Aria the Workshop Agent. Need help? Mention @facilitator in a comment.*'
'*This is an automated message from Gandalf the Workshop Agent. Need help? Mention @facilitator in a comment.*'
].join('\n');

await github.rest.issues.createComment({
Expand Down Expand Up @@ -270,7 +272,7 @@ jobs:
state: state,
target_url: `https://github.com/${context.repo.owner}/${context.repo.repo}/pull/${context.payload.pull_request.number}#issuecomment`,
description: description,
context: 'Aria the Workshop Agent / Validation'
context: 'Gandalf the Workshop Agent / Validation'
});

celebrate-review:
Expand All @@ -293,7 +295,7 @@ jobs:
'@' + context.payload.pull_request.user.login + ' \u2014 your PR has been approved! A facilitator will merge it soon.',
'',
'---',
'*Aria the Workshop Agent celebrates your collaboration*'
'*Gandalf the Workshop Agent celebrates your collaboration*'
].join('\n');

await github.rest.issues.createComment({
Expand Down Expand Up @@ -327,6 +329,6 @@ jobs:
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.payload.issue.number,
body: response + '\n\n---\n*Auto-response from Aria 🤖, your friendly Workshop Agent*'
body: response + '\n\n---\n*Auto-response from Gandalf, your friendly Workshop Agent*'
});
}
43 changes: 43 additions & 0 deletions .github/workflows/validate-authoritative-sources.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Validate Authoritative Sources

on:
pull_request:
paths:
- "*.md"
- "docs/**/*.md"
- "classroom/**/*.md"
- "learning-room/**/*.md"
- "admin/**/*.md"
- "scripts/add-authoritative-sources.js"
- "scripts/validate-authoritative-sources.js"
- "package.json"
- ".github/workflows/validate-authoritative-sources.yml"
push:
branches:
- main
paths:
- "*.md"
- "docs/**/*.md"
- "classroom/**/*.md"
- "learning-room/**/*.md"
- "admin/**/*.md"
- "scripts/add-authoritative-sources.js"
- "scripts/validate-authoritative-sources.js"
- "package.json"
- ".github/workflows/validate-authoritative-sources.yml"

jobs:
validate-authoritative-sources:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 20

- name: Validate authoritative source sections
run: npm run validate:authoritative-sources
19 changes: 19 additions & 0 deletions BATCH.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,22 @@ To pass a range to the audio build from npm:
```
npm run build:podcast-audio -- --start 5 --end 10
```

## Authoritative Sources

Use these official references when you need the current source of truth for facts in this chapter.

- [GitHub Docs, home](https://docs.github.com/en)
- [GitHub Changelog](https://github.blog/changelog/)

### Section-Level Source Map

Use this map to verify facts for each major section in this file.

- **Workflow order:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/), [Workflow syntax for GitHub Actions](https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax), [Secure use reference for GitHub Actions](https://docs.github.com/en/actions/security-for-github-actions/security-guides/security-hardening-for-github-actions), [GitHub Actions changelog](https://github.blog/changelog/label/actions/)
- **generate-transcripts.bat:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
- **generate-audio.bat:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
- **build-rss-feed.bat:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
- **validate-rss-feed.bat:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
- **Configuration file:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
- **npm scripts:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
20 changes: 19 additions & 1 deletion BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,5 +128,23 @@ When submitting pull requests:
- [highlight.js documentation](https://highlightjs.org/) - Syntax highlighting
- [GitHub Markdown spec](https://github.github.com/gfm/) - GitHub Flavored Markdown


For complete contributor guidelines, see [CONTRIBUTING.md](CONTRIBUTING.md#7-html-documentation-build-system).

## Authoritative Sources

Use these official references when you need the current source of truth for facts in this chapter.

- [GitHub Docs, home](https://docs.github.com/en)
- [GitHub Changelog](https://github.blog/changelog/)

### Section-Level Source Map

Use this map to verify facts for each major section in this file.

- **Quick Start:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
- **How It Works:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
- **Configuration Files:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
- **Customization:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
- **Troubleshooting:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
- **For Contributors:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
- **Additional Resources:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
28 changes: 20 additions & 8 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ We as members, contributors, and leaders pledge to make participation in our com

We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.


## Our Standards

Examples of behavior that contributes to a positive environment for our community:
Expand All @@ -25,7 +24,6 @@ Examples of unacceptable behavior:
- Publishing others' private information, such as a physical or electronic address, without their explicit permission
- Other conduct which could reasonably be considered inappropriate in a professional setting


## Accessibility Commitment

This community has an explicit commitment to accessibility. All participants - contributors, facilitators, reviewers, and community members - are expected to:
Expand All @@ -39,19 +37,16 @@ This community has an explicit commitment to accessibility. All participants - c

Accessibility concerns raised by community members are treated with the same urgency as any other bug report.


## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.

Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.


## Scope

This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official email address, posting via an official social media account, or acting as an appointed representative at an online or offline event.


## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement using the contact information below. All complaints will be reviewed and investigated promptly and fairly.
Expand All @@ -62,7 +57,6 @@ All community leaders are obligated to respect the privacy and security of the r

Do not open a public GitHub issue to report Code of Conduct concerns - report them directly to the email address above so that the matter can be handled privately.


## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
Expand Down Expand Up @@ -91,7 +85,6 @@ Community leaders will follow these Community Impact Guidelines in determining t

**Consequence:** A permanent ban from any sort of public interaction within the community.


## Attribution

This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 2.1, available at the [Contributor Covenant Code of Conduct version 2.1](https://www.contributor-covenant.org/version/2/1/code_of_conduct/).
Expand All @@ -100,5 +93,24 @@ Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcem

For answers to common questions about this code of conduct, see the FAQ at the [Contributor Covenant FAQ](https://www.contributor-covenant.org/faq). Translations are available at the [Contributor Covenant translations page](https://www.contributor-covenant.org/translations).


*[Back to README →](README.md) | [Contributing →](CONTRIBUTING.md)*

## Authoritative Sources

Use these official references when you need the current source of truth for facts in this chapter.

- [GitHub Docs, home](https://docs.github.com/en)
- [GitHub Changelog](https://github.blog/changelog/)

### Section-Level Source Map

Use this map to verify facts for each major section in this file.

- **Our Pledge:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
- **Our Standards:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
- **Accessibility Commitment:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/), [About Git](https://docs.github.com/en/get-started/using-git/about-git), [GitHub flow](https://docs.github.com/en/get-started/using-github/github-flow), [About pull requests](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests)
- **Enforcement Responsibilities:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
- **Scope:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
- **Enforcement:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
- **Enforcement Guidelines:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
- **Attribution:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/)
15 changes: 13 additions & 2 deletions COMING_SOON.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,26 @@

The full workshop curriculum, lesson materials, and reference guides are currently being finalized. They will be published here before the workshop begins.


### In the Meantime

- [**Join the Discussion Forum**](https://github.com/community-access/git-going-with-github/discussions) - ask questions, connect with fellow participants
- [**Return to the home page**](https://community-access.org/git-going-with-github/)


### Questions?

Need help? [File an issue](https://github.com/community-access/git-going-with-github/issues) in the workshop repository.

*A [Community Access](https://community-access.org) initiative.*

## Authoritative Sources

Use these official references when you need the current source of truth for facts in this chapter.

- [GitHub Docs, home](https://docs.github.com/en)
- [GitHub Changelog](https://github.blog/changelog/)

### Section-Level Source Map

Use this map to verify facts for each major section in this file.

- **GIT Going with GitHub - Workshop Materials:** [GitHub Docs, home](https://docs.github.com/en), [GitHub Changelog](https://github.blog/changelog/), [About Git](https://docs.github.com/en/get-started/using-git/about-git), [GitHub flow](https://docs.github.com/en/get-started/using-github/github-flow), [About pull requests](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests)
Loading
Loading