Skip to content
This repository was archived by the owner on Feb 18, 2025. It is now read-only.

checks and updates all the condition regex #186

Merged
braughtg merged 2 commits into from
Feb 16, 2025
Merged

checks and updates all the condition regex #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5767869
checks and updates all the condition regex
braughtg Feb 16, 2025
0b208f7
ensured all regex accept correct answers + small edits
braughtg Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 28 additions & 31 deletions source/ch-communities-and-collaboration/sec-cloning-your-origin.ptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,20 +84,20 @@
<var width="55" />
</p>
</statement>
<setup> <var> <condition string="^https://github.com/(?!(FarmData2|DickinsonCollege)).+/.+.git$">
<setup> <var> <condition string="^https://github\.com/(?!(FarmData2|DickinsonCollege)).+/.+\.git$">
<feedback>
<p>
Thank you.
</p>
</feedback>
</condition> <condition string="^https://github.com/DickinsonCollege/.+.git">
</condition> <condition string="^https://github\.com/DickinsonCollege/.+\.git">

<feedback>
<p>
It looks like you might be trying to use the upstream repository instead of your origin.
</p>
</feedback>
</condition> <condition string="^https://github.com/FarmData2/.+.git">
</condition> <condition string="^https://github\.com/FarmData2/.+\.git">

<feedback>
<p>
Expand Down Expand Up @@ -152,34 +152,31 @@
<var width="65" />
</p>
</statement>
<setup> <var> <condition string="^https://github.com/(?!(FarmData2|DickinsonCollege)).+/.+.git$">
<feedback>
<p>
Thank you.
</p>
</feedback>
</condition> <condition string="^https://github.com/DickinsonCollege/.+.git">

<feedback>
<p>
It looks like you might be trying to use the upstream repository instead of your origin.
</p>
</feedback>
</condition> <condition string="^https://github.com/FarmData2/.+.git">

<feedback>
<p>
It looks like you might be trying to use the upstream repository instead of your origin.
</p>
</feedback>
</condition> <condition string=".*">

<feedback>
<p>
Be sure to replace <c>&lt;URL&gt;</c> with the clone URL you found in <xref ref="ex-clone-url" />. The clone URL should have the format <c>https://github.com/yourGitHubUsername/theRepoName.git</c>.
</p>
</feedback>
</condition> </var> </setup>
<setup>
<var>
<condition string="^git clone https://github\.com/(?!(FarmData2|DickinsonCollege)).+/.+\.git$">
<feedback>
<p>
Thank you.
</p>
</feedback>
</condition>
<condition string="^git clone https://github\.com/(DickinsonCollege|FarmData2)/.+\.git">
<feedback>
<p>
It looks like you might be trying to clone the upstream repository instead of your origin.
</p>
</feedback>
</condition>
<condition string=".*">
<feedback>
<p>
Be sure to replace the URL with the clone URL you found in <xref ref="ex-clone-url" />. The clone URL should have the format <c>https://github.com/yourGitHubUsername/theRepoName.git</c>.
</p>
</feedback>
</condition>
</var>
</setup>
</exercise>
<exercise xml:id="ex-clone-origin-a" label="ex-clone-origin-a">
<p>
Expand Down
4 changes: 2 additions & 2 deletions source/ch-communities-and-collaboration/sec-extra-practice.ptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
</statement>
<setup>
<var>
<condition string="^https://github.com/((?!(openmrs/openmrs-distro-referenceapplication|apache/fineract|sahana/eden|oppia/oppia)).)*$">
<condition string="^https://github\.com/(?!(openmrs/openmrs-distro-referenceapplication|apache/fineract|sahana/eden|oppia/oppia)).*$">
<feedback>
<p>
Thank you.
Expand All @@ -105,7 +105,7 @@
</setup>
<hint>
<p>
Make sure you are giving the URL for your fork, not the project's URL. Review <xref ref="topic-forking-the-upstream" /> for information on how to fork a repository on GitHub.
Make sure you are giving the URL for your fork, not the project's upstream URL. Review <xref ref="topic-forking-the-upstream" /> for information on how to fork a repository on GitHub.
</p>
</hint>
</exercise>
Expand Down
16 changes: 8 additions & 8 deletions source/ch-communities-and-collaboration/sec-forking-the-upstream.ptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,28 +51,28 @@

<setup>
<var>
<condition string="^https://github.com/((?!(yourClass|theRepoName|FarmData2/FarmData2|DickinsonCollege/FarmData2))).*$">
<condition string="^https://github\.com/(?!(yourClass|theRepoName|FarmData2/FarmData2|DickinsonCollege/FarmData2)).*$">
<feedback>
<p>
Thank you.
</p>
</feedback>
</condition>
<condition string="^https://github.com/DickinsonCollege/FarmData2">
<condition string="^https://github\.com/DickinsonCollege/FarmData2">
<feedback>
<p>
Looks like you might be trying to use the real FarmData2 upstream. Be sure to use the URL that your instructor has given you.
</p>
</feedback>
</condition>
<condition string="^https://github.com/FarmData2/FarmData2">
<condition string="^https://github\.com/FarmData2/FarmData2">
<feedback>
<p>
Looks like you might be trying to use the real FarmData2 upstream. Be sure to use the URL that your instructor has given you.
</p>
</feedback>
</condition>
<condition string="^https://github.com/yourClass/theRepoName">
<condition string="^https://github\.com/yourClass/theRepoName">
<feedback>
<p>
Looks like you might be trying to use the example above. That was just for illustration. Be sure to use the URL that your instructor has given you.
Expand Down Expand Up @@ -156,28 +156,28 @@

<setup>
<var>
<condition string="^https://github.com/((?!(yourGitHub|theRepoName|FarmData2/FarmData2|DickinsonCollege/FarmData2))).*$">
<condition string="^https://github\.com/(?!(yourGitHub|theRepoName|FarmData2/FarmData2|DickinsonCollege/FarmData2)).*$">
<feedback>
<p>
Thank you.
</p>
</feedback>
</condition>
<condition string="^https://github.com/DickinsonCollege/FarmData2">
<condition string="^https://github\.com/DickinsonCollege/FarmData2">
<feedback>
<p>
Looks like you might be giving the URL of the real FarmData2 upstream. Be sure to give the URL of the fork you created in your GitHub space.
</p>
</feedback>
</condition>
<condition string="^https://github.com/FarmData2/FarmData2">
<condition string="^https://github\.com/FarmData2/FarmData2">
<feedback>
<p>
Looks like you might be trying to use the real FarmData2 upstream. Be sure to give the URL of the fork you created in your GitHub space.
</p>
</feedback>
</condition>
<condition string="^https://github.com/yourGitHub/theRepoName$">
<condition string="^https://github\.com/yourGitHub/theRepoName">
<feedback>
<p>
Looks like you might be trying to use the example above. That was just for illustration. Be sure to use the URL that your instructor has given you.
Expand Down
12 changes: 10 additions & 2 deletions source/ch-communities-and-collaboration/sec-github-set-up.ptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,21 @@
<var width="45" />
</p>
</statement>
<setup> <var> <condition string="^https://github.com/.+">
<setup> <var> <condition string="^https://github\.com/(?!(yourUsername)).+$">
<feedback>
<p>
Thank you.
</p>
</feedback>
</condition> <condition string=".*">
</condition>
<condition string="https://github\.com/yourUsername">
<feedback>
<p>
Looks like you are using the example given. Be sure to give the URL of your actual GitHub profile.
</p>
</feedback>
</condition>
<condition string=".*">

<feedback>
<p>
Expand Down
12 changes: 10 additions & 2 deletions source/ch-communities-and-collaboration/sec-the-issue-tracker.ptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,13 +472,21 @@
<var width="60" />
</p>
</statement>
<setup> <var> <condition string="^https://github.com/.+/issues/[0-9]+$">
<setup> <var> <condition string="^https://github\.com/(?!(my-class|FarmData2/FarmData2|DickinsonCollege/FarmData2)).+/issues/[0-9]+$">
<feedback>
<p>
Thank you.
</p>
</feedback>
</condition> <condition string=".*">
</condition>
<condition string="https://github\.com/my-class/GitKit-FarmData2/issues/2">
<feedback>
<p>
Looks like you are trying to use the example above. Be sure to use the URL for your actual issue.
</p>
</feedback>
</condition>
<condition string=".*">

<feedback>
<p>
Expand Down
4 changes: 2 additions & 2 deletions source/ch-merge-conflicts/sec-extra-practice.ptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@
</statement>
<setup>
<var>
<condition string="^https://github\.com/(?!(FarmData2/FarmData2|DickinsonCollege/FarmData2)).*/pull/[0-9]+$">
<condition string="^https://github\.com/(?!(FarmData2|DickinsonCollege/FarmData2)).+/pull/[0-9]+$">
<feedback>
<p>
Thank you.
Expand All @@ -365,7 +365,7 @@
<condition string=".*">
<feedback>
<p>
Be sure that your URL is from your pull request to the upstream repository. It should have the format <c>https://github.com/upstreamLocation/upstreamReop/pulls/xx</c>, where <c>xx</c> is a number.
Be sure that your URL is from your pull request to the upstream repository for your course. It should have the format <c>https://github.com/yourCourse/repoName/pulls/xx</c>, where <c>xx</c> is a number.
</p>
</feedback>
</condition>
Expand Down
7 changes: 0 additions & 7 deletions source/ch-merge-conflicts/sec-merging-the-main-branch-into-a-feature-branch.ptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,13 +235,6 @@
</p>
</feedback>
</condition>
<condition string=".*">
<feedback>
<p>
Review the format of the <c>git merge</c> command above.
</p>
</feedback>
</condition>
<condition string=".*">
<feedback>
<p>
Expand Down
2 changes: 1 addition & 1 deletion source/ch-merge-conflicts/sec-updating-your-pull-request.ptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
</p>
</feedback>
</condition>
<condition string="^git .*">
<condition string=".*">
<feedback>
<p>
Review the <c>git push</c> command in <xref ref="topic-pushing-a-branch-to-your-origin" />.
Expand Down
18 changes: 16 additions & 2 deletions source/ch-upstreaming-changes/sec-committing-to-your-local-repository.ptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,19 +112,33 @@
</p>

<p>
<var width="55" />
<var width="75" />
</p>
</statement>
<setup>
<var>
<condition string='^git commit -m ["].+["]$'>
<condition string='^git commit -m ["].{20,72}["]$'>
<feedback>
<p>
Thank you.
Your command is in the proper format, please make sure the commit message is meaningful.
</p>
</feedback>
</condition>
<condition string='^git commit -m ["].{0,20}["]$'>
<feedback>
<p>
Try using a longer commit message to be more descriptive.
</p>
</feedback>
</condition>
<condition string='^git commit -m ["].{73,}["]$'>
<feedback>
<p>
Try using a more concise commit message.
</p>
</feedback>
</condition>
<condition string=".*">

<feedback>
Expand Down
11 changes: 7 additions & 4 deletions source/ch-upstreaming-changes/sec-creating-a-pull-request.ptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,14 +235,17 @@
<var width="55" />
</p>
</statement>
<setup> <var> <condition string='^https://github.com/(?!(FarmData2/FarmData2|DickinsonCollege/FarmData2))(.+/.+)/pull/[0-9]+$'>
<feedback></feedback>
<setup> <var> <condition string='^https://github\.com/(?!(FarmData2/FarmData2|DickinsonCollege/FarmData2))(.+/.+)/pull/[1-9][0-9]*$'>
<feedback>
<p>
Thank you.
</p>
</feedback>
</condition> <condition string=".*">

<feedback>
<p>
The upstream repository is the repository you forked from.
Double check that you aren't in your origin repository.
Double check the URL of your pull request to ensure that it is in the upstream for your course and is correct.
</p>
</feedback>
</condition> </var> </setup>
Expand Down
4 changes: 2 additions & 2 deletions source/ch-upstreaming-changes/sec-editing-local-files.ptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<var width="55" />
</p>
</statement>
<setup> <var> <condition string="^https://github.com/.+/issues/\b([1-9]|[12][0-9]|3[0-5])\b$">
<setup> <var> <condition string="^https://github\.com/(?!(FarmData2/FarmData2|DickinsonCollege/FarmData2)).+/issues/([4-9]|[12][0-9]|3[0-5])$">
<feedback>
<p>
Thank you.
Expand All @@ -37,7 +37,7 @@

<feedback>
<p>
Make sure you have pasted the complete URL starting with https and ending with the issue number.
Make sure you have pasted the complete URL starting with https and ending with the issue number that you have been assigned.
</p>
</feedback>
</condition> </var> </setup>
Expand Down
11 changes: 9 additions & 2 deletions source/ch-upstreaming-changes/sec-staging-changes.ptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,27 @@
</statement>
<setup>
<var>
<condition string="^git stage(\s+)(CONTRIBUTING.md|INSTALL.md|ONBOARDING.md|README.md)$">
<condition string="^git stage (CONTRIBUTING.md|INSTALL.md|ONBOARDING.md|README.md)$">
<feedback>
<p>
Thank you.
</p>
</feedback>
</condition>
<condition string="^git stage(\s+)!(CONTRIBUTING.md|INSTALL.md|ONBOARDING.md|README.md)$">
<condition string="^git stage (?!(CONTRIBUTING.md|INSTALL.md|ONBOARDING.md|README.md)).*">
<feedback>
<p>
Are you sure that is the file that the issue asked you to edit?
</p>
</feedback>
</condition>
<condition string=".*">
<feedback>
<p>
Check the format of your <c>git stage</c> command.
</p>
</feedback>
</condition>
</var>
</setup>
<hint>
Expand Down