Skip to content

Commit 167eb92

Browse files
harshithab371harshithab371
committed
resolve merge conflict and update inline comments
2 parents 96e2758 + f85108a commit 167eb92

13 files changed

Lines changed: 561 additions & 235 deletions

File tree

‎.github/labeler.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
ui:
2+
- changed-files:
3+
- any-glob-to-any-file:
4+
- "templates/**"
5+
- "static/**"
6+
7+
documentation:
8+
- changed-files:
9+
- any-glob-to-any-file:
10+
- "README.md"
11+
- "CONTRIBUTING.md"
12+
- "CODE_OF_CONDUCT.md"
13+
- "docs/**"
14+
15+
data:
16+
- changed-files:
17+
- any-glob-to-any-file:
18+
- "data/**"
19+
20+
type:testing:
21+
- changed-files:
22+
- any-glob-to-any-file:
23+
- "tests/**"
24+
25+
type:accessibility:
26+
- changed-files:
27+
- any-glob-to-any-file:
28+
- "templates/**"
29+
- "static/**"
30+
31+
type:performance:
32+
- changed-files:
33+
- any-glob-to-any-file:
34+
- "utils/**"
35+
36+
type:security:
37+
- changed-files:
38+
- any-glob-to-any-file:
39+
- "utils/**"

‎.github/workflows/auto-file-labels.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Label PRs Based on Files
2+
3+
on:
4+
pull_request_target:
5+
types:
6+
- opened
7+
- synchronize
8+
- reopened
9+
10+
permissions:
11+
contents: read
12+
pull-requests: write
13+
issues: write
14+
15+
jobs:
16+
labeler:
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- name: Label PRs automatically
21+
uses: actions/labeler@v5
22+
23+
with:
24+
repo-token: "${{ secrets.GITHUB_TOKEN }}"

‎.github/workflows/auto-label-gssoc.yml‎

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

‎.github/workflows/auto-label-issues.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Auto Label Issues
2+
3+
on:
4+
issues:
5+
types:
6+
- opened
7+
8+
permissions:
9+
issues: write
10+
11+
jobs:
12+
label-issues:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: Add default labels to new issue
17+
uses: actions/github-script@v7
18+
19+
with:
20+
script: |
21+
await github.rest.issues.addLabels({
22+
owner: context.repo.owner,
23+
repo: context.repo.repo,
24+
issue_number: context.payload.issue.number,
25+
labels: ['gssoc-2026']
26+
});

‎.github/workflows/auto-label-prs.yml‎

Lines changed: 37 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,123 +1,76 @@
11
name: Auto Label Pull Requests
22

33
on:
4-
pull_request:
4+
pull_request_target:
55
types:
66
- opened
77
- reopened
88
- synchronize
99

10-
workflow_dispatch:
11-
1210
permissions:
1311
pull-requests: write
12+
issues: write
1413

1514
jobs:
16-
17-
# ------------------------------------------------------------
18-
# Auto-label new pull requests
19-
# ------------------------------------------------------------
20-
auto-label-new-prs:
21-
if: github.event_name == 'pull_request'
15+
auto-label-prs:
2216
runs-on: ubuntu-latest
2317

2418
steps:
25-
- name: Apply labels to PR
19+
- name: Apply PR labels
2620
uses: actions/github-script@v7
21+
2722
with:
2823
script: |
2924
const pr = context.payload.pull_request;
3025
const branch = pr.head.ref;
3126
32-
let labels = ['gssoc-26'];
27+
let labels = ['gssoc-2026'];
28+
29+
// Difficulty labels
30+
if (branch.startsWith('level1/')) {
31+
labels.push('level:beginner');
32+
}
33+
34+
if (branch.startsWith('level2/')) {
35+
labels.push('level:intermediate');
36+
}
3337
34-
if (branch.startsWith('fix/')) {
35-
labels.push('bug');
38+
if (branch.startsWith('level3/')) {
39+
labels.push('level:advanced');
3640
}
3741
38-
if (branch.startsWith('feat/')) {
39-
labels.push('enhancement');
42+
if (branch.startsWith('level4/')) {
43+
labels.push('level:critical');
4044
}
4145
42-
if (branch.startsWith('docs/')) {
43-
labels.push('documentation');
46+
// Type labels
47+
if (branch.includes('feat/')) {
48+
labels.push('type:feature');
4449
}
4550
46-
if (branch.startsWith('style/')) {
47-
labels.push('ui');
51+
if (branch.includes('fix/')) {
52+
labels.push('type:bug');
4853
}
4954
50-
if (branch.startsWith('test/')) {
51-
labels.push('testing');
55+
if (branch.includes('docs/')) {
56+
labels.push('type:docs');
5257
}
5358
54-
if (branch.startsWith('refactor/')) {
55-
labels.push('refactor');
59+
if (branch.includes('refactor/')) {
60+
labels.push('type:refactor');
61+
}
62+
63+
if (branch.includes('test/')) {
64+
labels.push('type:testing');
65+
}
66+
67+
if (branch.includes('style/')) {
68+
labels.push('type:design');
5669
}
5770
5871
await github.rest.issues.addLabels({
5972
owner: context.repo.owner,
6073
repo: context.repo.repo,
6174
issue_number: pr.number,
6275
labels
63-
});
64-
65-
# ------------------------------------------------------------
66-
# Apply labels to ALL existing PRs
67-
# ------------------------------------------------------------
68-
label-existing-prs:
69-
if: github.event_name == 'workflow_dispatch'
70-
runs-on: ubuntu-latest
71-
72-
steps:
73-
- name: Label all existing PRs
74-
uses: actions/github-script@v7
75-
with:
76-
script: |
77-
const pulls = await github.paginate(
78-
github.rest.pulls.list,
79-
{
80-
owner: context.repo.owner,
81-
repo: context.repo.repo,
82-
state: 'all'
83-
}
84-
);
85-
86-
for (const pr of pulls) {
87-
88-
const branch = pr.head.ref;
89-
let labels = ['gssoc-26'];
90-
91-
if (branch.startsWith('fix/')) {
92-
labels.push('bug');
93-
}
94-
95-
if (branch.startsWith('feat/')) {
96-
labels.push('enhancement');
97-
}
98-
99-
if (branch.startsWith('docs/')) {
100-
labels.push('documentation');
101-
}
102-
103-
if (branch.startsWith('style/')) {
104-
labels.push('ui');
105-
}
106-
107-
if (branch.startsWith('test/')) {
108-
labels.push('testing');
109-
}
110-
111-
if (branch.startsWith('refactor/')) {
112-
labels.push('refactor');
113-
}
114-
115-
await github.rest.issues.addLabels({
116-
owner: context.repo.owner,
117-
repo: context.repo.repo,
118-
issue_number: pr.number,
119-
labels
120-
});
121-
122-
console.log(`Labels added to PR #${pr.number}`);
123-
}
76+
});

‎.github/workflows/greetings.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Greetings
2+
3+
on:
4+
issues:
5+
types:
6+
- opened
7+
8+
pull_request_target:
9+
types:
10+
- opened
11+
12+
permissions:
13+
issues: write
14+
pull-requests: write
15+
16+
jobs:
17+
greeting:
18+
runs-on: ubuntu-latest
19+
20+
steps:
21+
- name: Send greeting
22+
uses: actions/first-interaction@v1
23+
24+
with:
25+
repo-token: ${{ secrets.GITHUB_TOKEN }}
26+
27+
issue-message: |
28+
Thank you for opening your first issue in DevPath.
29+
30+
Please make sure to:
31+
- Read CONTRIBUTING.md
32+
- Wait for assignment before starting work
33+
- Follow repository guidelines carefully
34+
35+
Happy contributing.
36+
37+
pr-message: |
38+
Thank you for submitting your first pull request to DevPath.
39+
40+
Before review:
41+
- Complete the PR template fully
42+
- Ensure all tests pass
43+
- Link your PR to an issue
44+
- Keep changes scoped to the issue
45+
46+
A maintainer will review your contribution soon.

‎starter_code/expense_tracker.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
"""
2-
expense_tracker.py
3-
==================
41
Project: Personal Expense Tracker
52
Difficulty: Beginner
63
Skills: Python, CSV module, datetime module
@@ -322,4 +319,4 @@ def main():
322319

323320

324321
if __name__ == "__main__":
325-
main()
322+
main()

0 commit comments

Comments
 (0)