Skip to content
This repository was archived by the owner on Aug 30, 2023. It is now read-only.

Commit 3a08f47

Browse files
shivaylambasj5027052
authored andcommitted
Squashed all commit
Signed-off-by: Sanyam Jain <sj5027052@gmail.com>
1 parent 252bcd1 commit 3a08f47

26 files changed

+405
-0
lines changed

.github/workflows/linter.yaml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Lint Code Base
2+
3+
on:
4+
push:
5+
branches-ignore: [master, main]
6+
# Remove the line above to run when pushing to master
7+
pull_request:
8+
branches: [master, main]
9+
10+
jobs:
11+
build:
12+
# Name the Job
13+
name: Lint Code Base
14+
# Set the agent to run on
15+
runs-on: ubuntu-latest
16+
17+
##################
18+
# Load all steps #
19+
##################
20+
steps:
21+
##########################
22+
# Checkout the code base #
23+
##########################
24+
- name: Checkout Code
25+
uses: actions/checkout@v3
26+
with:
27+
# Full git history is needed to get a proper list of changed files within `super-linter`
28+
fetch-depth: 0
29+
30+
################################
31+
# Run Linter against code base #
32+
################################
33+
- name: Lint Code Base
34+
uses: github/super-linter@v4
35+
env:
36+
VALIDATE_ALL_CODEBASE: false
37+
DEFAULT_BRANCH: main
38+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Challenges/challenge_10.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
## Welcome to Challenge 10
2+
3+
Welcome to the 10th challenge!
4+
5+
Today's challenge is based on the concept of signing your commits. Signing the commits is a way of showing that only authentic commits are being made.
6+
7+
A lot of open source projects have DCO which stands for [Developer Certification of Origin](https://github.com/apps/dco) including this repository itself and it tries to verify that each commit is signed or not. In case your commit is not signed it will reflect in the pull request that it doesn't pass the DCO test.
8+
9+
You can read more about how to sign commits [here](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits)
10+
11+
Task:
12+
1. Setup the ability to sign commits locally in your systems
13+
2. Whenever committing in the future always try to use signed commits
14+
3. Make a new signed commit to the pull request that you have made in previous challenges by making this change to the ``yourusername.md`` file:
15+
```
16+
---
17+
name: your_name
18+
github_user_name: YOUR-GITHUB-USERNAME
19+
url_of_github_issue: Link_of_the_github_issue_created_in_first_challenge
20+
your_favroite_programming_language: Add your favorite programming language here
21+
---
22+
```

Challenges/challenge_11.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
## Welcome to Challenge 11
2+
3+
Welcome to the 11th challenge!
4+
5+
Today's challenge is simple.
6+
7+
Task:
8+
1. Create another branch from your current branch created in previous challenges (Don't create a new branch from main).
9+
2. Share screenshot of this new branch in the issue created in previous challenge

Challenges/challenge_12.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
## Welcome to Challenge 12
2+
3+
Welcome to the 12th Challenge
4+
5+
Today's challenge is a re-practice of the 7th Challenge (https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_7.md?plain=1)
6+
7+
So focus for this challenge will be to practice the ``git rebase`` command. We still see a number of Pull requests that have a lot more commits than there should be, therefore we give you a chance to correct it again.
8+
9+
Ensure to practice the ``git rebase`` command by creating your own local git repository. You can checkout this guide: https://www.freecodecamp.org/news/git-squash-explained/
10+
11+
Task:
12+
1. Practice git rebase, and how to squash commit using git rebase in your local projects
13+
2. Once done, try to squash the commits in your pull request in the Challenge repository
14+
3. We also see a lot of challengers are not signing their commits. Refer to Challenge 10: https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_10.md and ensure to sign your commits.

Challenges/challenge_13.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
## Welcome to Challenge 13
2+
3+
Welcome to the 13th Challenge
4+
5+
Today's challenge involves how to use ``git stash`` command effectively. You can refer on how to stash your commits [here](https://git-scm.com/book/en/v2/Git-Tools-Stashing-and-Cleaning)
6+
7+
Task:
8+
1. Inside the branch you created in the previous challenge ``your-username-details`` create a new file inside the ``contributors/<YOUR-GITHUB_USERNAME>/`` directory.
9+
2. Use the git stash command to move these changes to the stash area
10+
3. Delete the content from the stash area and share a screenshot of this inside the Github issue you created in the first challenge

Challenges/challenge_14.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
## Welcome to Challenge 14
2+
3+
Welcome to the 14th Challenge
4+
5+
Today is the first part of the two challenges related to resolving merge conflicts. You can take a look at [this article](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) to learn more about merge conflicts.
6+
7+
As part of the challenge, try to create a scenario of a merge conflict locally in your system for a project that you can create.
8+
9+
Task:
10+
1. Follow the article shared above and try to reproduce a case of merge conflict in your system for a project and try to resolve it
11+
2. Share appropriate screenshot in the issue created in the first challenge.

Challenges/challenge_15.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
## Welcome to Challenge 15
2+
3+
Welcome to the 15th Challenge
4+
5+
In this 2 part challenge, we will try to emulate and fix merge conflicts via git.
6+
7+
Today is the first part of this challenge:
8+
9+
Task:
10+
1. Update your Forked Repo From the Original Repo. Also ensure that your branch ``your-user-name-details`` is also synced with the latest changes from the original repository
11+
12+
2. In your branch ``your-user-name-details`` open the add your name to the list of challengers inside the ``challengers-list.md`` file by following the format in the file.
13+
14+
3. Push your change to reflect in the Pull Request created in previous challenges
15+

Challenges/challenge_16.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
## Welcome to Challenge 16
2+
3+
Welcome to the 16th Challenge
4+
5+
In this 2 part challenge, we will try to emulate and fix merge conflicts via git.
6+
7+
Today is the second and final part of this challenge:
8+
9+
Task:
10+
1. You will notice that your pull request will have a conflict: <img width="636" alt="image" src="https://user-images.githubusercontent.com/19529592/190574995-0cc506a8-a2fe-4aa4-98bd-4658e8aa2fc1.png">
11+
12+
2. Try to resolve this merge conflict using local git
13+
14+
3. Once resolved, share screenshot on the github issue created in the previous challenges

Challenges/challenge_17.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
## Welcome to Challenge 17
2+
3+
Welcome to the 17th Challenge
4+
5+
Today we will be leaning how to work with GitHub Desktop
6+
7+
#### Brief Overview
8+
9+
GitHub Desktop is a GUI that empowers *lazy* users who prefer not to work with the CLI to still interface with Git and GitHub.
10+
To learn more visit: [What the heck is Git GUI](https://help.github.com/en/desktop/getting-started-with-github-desktop)
11+
12+
13+
## Tasks
14+
15+
- Download GitHub desktop
16+
- Create a new repository on GitHub
17+
- Add anything you want to your repo
18+
- Follow through all the GitHub workflow you know using the GUI (commit, branching, pulling, pushing etc)
19+
- Share a screenshot of your experience using github desktop on the issue created in prior challenges

Challenges/challenge_18.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
## Welcome to Challenge 18
2+
3+
Welcome to the 18th Challenge
4+
5+
Today we will be learning to work with GitHub Gist and Markdown
6+
7+
#### Brief Overview
8+
9+
GitHub Gist is two fold and you can either use it for sharing ideas or sharing smaple code. It supports **Markdown**
10+
To learn more, vist:
11+
- [Learn more about GitHub gist](https://help.github.com/en/enterprise/2.13/user/articles/about-gists)
12+
13+
## Task
14+
15+
- Create a gist writing on any software development related topic that interests you
16+
- Create a gist sharing a small code snippet in your preferred programming language
17+
18+
## How to Submit
19+
20+
- Create your submission a markdown file named ``gist-solutions.md`` and add it inside the branch ``your-username-details`` used in previous challenges
21+
- In your submission file add the links to your **2 gist**
22+
- Ensure you push it so that it reflects inside your Pull request created in previous challenges

0 commit comments

Comments
 (0)