Skip to content

Commit 1b62126

Browse files
authored
Merge pull request #19 from progit/refactor/progit2
2 parents 1c0a6ca + b57d39c commit 1b62126

192 files changed

Lines changed: 7738 additions & 8032 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.dependabot/config.yml

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

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 92 deletions
This file was deleted.
Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
name: Bug report
2+
description: Create a report to help us improve
3+
labels: ["bug"]
4+
body:
5+
- type: checkboxes
6+
attributes:
7+
label: There's no existing/similar bug report.
8+
description: Please search to see if an issue already exists for the bug you encountered.
9+
options:
10+
- label: I have searched the existing issues
11+
required: true
12+
13+
- type: checkboxes
14+
attributes:
15+
label: This report is about a single actionable bug.
16+
description: Please create one issue per bug, split up your bug reports if needed.
17+
options:
18+
- label: I'm reporting a single actionable bug
19+
required: true
20+
21+
- type: checkboxes
22+
attributes:
23+
label: This report is about the ProGit book, version 2, English language.
24+
description: Bug reports about translations or the first version of the book are not accepted.
25+
options:
26+
- label: This bug is not about a translation or old version
27+
required: true
28+
29+
- type: checkboxes
30+
attributes:
31+
label: Bug covers book website/pdf
32+
description: This bug is about the book as found on the [website](https://www.git-scm.com/book/en/v2) or the PDF.
33+
options:
34+
- label: I confirm the bug is about the book as found on the website/pdf
35+
validations:
36+
required: false
37+
38+
- type: checkboxes
39+
attributes:
40+
label: Problem is present in the Pro Git book on the website?
41+
description: If you found an issue in the pdf/epub/mobi files, you've checked if the problem is also present in the Pro Git book on the [website](https://www.git-scm.com/book/en/v2).
42+
options:
43+
- label: This bug also affects the Pro Git book as published on the website.
44+
validations:
45+
required: false
46+
47+
- type: dropdown
48+
attributes:
49+
label: Which version of the book is affected?
50+
description: |
51+
It's important for us to know if the problem is in the source or in the tooling that creates the pdf/epub/mobi files.
52+
Therefore, please select which versions are affected.
53+
options:
54+
- "Source files"
55+
- "Tooling"
56+
- "Source files and tooling"
57+
- "I don't know"
58+
validations:
59+
required: true
60+
61+
- type: textarea
62+
attributes:
63+
label: "Describe the bug:"
64+
description: A clear and concise description of what the bug is.
65+
validations:
66+
required: true
67+
68+
- type: textarea
69+
attributes:
70+
label: "Steps to reproduce:"
71+
description: Please write the steps needed to reproduce the bug here.
72+
placeholder: Provide a ordered list of steps to reproduce.
73+
value: |
74+
1. Go to '...'
75+
2. Click on '...'
76+
3. 'Scroll down to '...'
77+
4. See error
78+
validations:
79+
required: true
80+
81+
- type: textarea
82+
attributes:
83+
label: "Expected behavior:"
84+
description: A clear and concise description of what you expected to happen.
85+
placeholder: I expected ... to happen.
86+
validations:
87+
required: true
88+
89+
- type: textarea
90+
attributes:
91+
label: "Screenshots:"
92+
description: If applicable, add screenshots to help explain your problem.
93+
placeholder: "Tip: you can drag your screenshot into this field, or you can copy/paste."
94+
validations:
95+
required: false
96+
97+
- type: textarea
98+
attributes:
99+
label: "Additional context:"
100+
description: |
101+
Add any other context about the problem here.
102+
You can also put references to similar bugs here.
103+
placeholder: "Example: this bug also affect issues #1 and #2."
104+
validations:
105+
required: false
106+
107+
- type: input
108+
attributes:
109+
label: Device
110+
description: Tell us what kind of device you're using to access the content.
111+
placeholder: mobile device / desktop / laptop / e-book reader
112+
validations:
113+
required: false
114+
115+
- type: input
116+
attributes:
117+
label: Operating system
118+
description: If the problem is with the book or the published files, we need to know what operating system you run on your device.
119+
placeholder: |
120+
Windows 10 Home Edition
121+
validations:
122+
required: false
123+
124+
- type: input
125+
attributes:
126+
label: Browser/application + version
127+
description: What browser/application are you using? We also need the version number of the browser/application.
128+
placeholder: |
129+
Google Chrome 91.0.4472.164
130+
validations:
131+
required: false

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
blank_issues_enabled: true
2+
contact_links:
3+
- name: Translation bug
4+
url: https://github.com/progit/progit2/blob/main/TRANSLATING.md
5+
about: Refer to this table to find out where to report translation bugs.
6+
7+
- name: Report bugs for git-scm.com site
8+
url: https://github.com/git/git-scm.com/issues/
9+
about: Please report problems with the git-scm.com site there.
10+
11+
- name: Bug is about Git program itself
12+
url: https://git-scm.com/community
13+
about: Please report problems with the Git program there.
14+
15+
- name: Bug is about Git for Windows
16+
url: https://github.com/git-for-windows/git/issues
17+
about: Please report problems with Git for Windows there.
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Enhancement idea
2+
description: Suggest an idea for the ProGit2 book or repository
3+
labels: ["enhancement"]
4+
body:
5+
- type: textarea
6+
attributes:
7+
label: General overview of your idea.
8+
description: Give a general overview of your idea.
9+
validations:
10+
required: true
11+
12+
- type: textarea
13+
attributes:
14+
label: What problem will this solve?
15+
description: Explain what problem you're trying to solve.
16+
validations:
17+
required: true
18+
19+
- type: textarea
20+
attributes:
21+
label: Have you thought about other solutions?
22+
description: Describe any alternative solutions to the problem.
23+
validations:
24+
required: false
25+
26+
- type: dropdown
27+
attributes:
28+
label: Do you want to help with this enhancement idea?
29+
options:
30+
- "Yes"
31+
- "Maybe"
32+
- "No"
33+
validations:
34+
required: true

.github/dependabot.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
version: 2
2+
updates:
3+
# Maintain dependencies for Ruby
4+
- package-ecosystem: "bundler"
5+
directory: "/"
6+
schedule:
7+
interval: "daily" # Checks on Monday through Friday.
8+
9+
# Maintain GitHub Action runners
10+
- package-ecosystem: "github-actions"
11+
directory: "/"
12+
schedule:
13+
interval: "daily" # Checks on Monday through Friday.
14+
15+
# Set default reviewer and labels
16+
reviewers:
17+
- "ben"
18+
labels:
19+
- "dependabot"

.github/pull_request_template.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<!-- Thanks for contributing! -->
2+
<!-- Before you start on a large rewrite or other major change: open a new issue first, to discuss the proposed changes. -->
3+
<!-- Should your changes appear in a printed edition, you'll be included in the contributors list. -->
4+
5+
<!-- Mark the checkbox [X] or [x] if you agree with the item. -->
6+
- [ ] I provide my work under the [project license](https://github.com/progit/progit2/blob/main/LICENSE.asc).
7+
- [ ] I grant such license of my work as is required for the purposes of future print editions to [Ben Straub](https://github.com/ben) and [Scott Chacon](https://github.com/schacon).
8+
9+
## Changes
10+
11+
-
12+
13+
## Context
14+
<!--
15+
List related issues.
16+
Provide the necessary context to understand the changes you made.
17+
18+
Are you fixing an issue with this pull-request?
19+
Use the "Fixes" keyword, to close the issue automatically after your work is merged.
20+
21+
Fixes #123
22+
Fixes #456
23+
-->

.github/workflows/pr-build.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Pull Request Build
2+
3+
on:
4+
pull_request:
5+
branches: [ main ]
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
13+
- name: Set up Ruby
14+
uses: ruby/setup-ruby@v1
15+
with:
16+
ruby-version: 3.1
17+
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
18+
19+
- name: Build book
20+
run: bundle exec rake book:build
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Release on push to main
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
7+
jobs:
8+
release:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
with:
13+
fetch-depth: 0
14+
15+
- name: Set up Ruby
16+
uses: ruby/setup-ruby@v1
17+
with:
18+
ruby-version: 3.1
19+
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
20+
21+
- name: Build release assets
22+
run: bundle exec rake book:build
23+
24+
- name: Compute tag name
25+
id: compute-tag
26+
run: |
27+
echo Computing next tag number
28+
LASTPATCH=$(git describe --tags | cut -d- -f1 | cut -d. -f3)
29+
PATCH=$(($LASTPATCH+1))
30+
echo "tagname=2.1.${PATCH}" >> $GITHUB_OUTPUT
31+
32+
- name: Create release
33+
uses: ncipollo/release-action@v1
34+
with:
35+
token: ${{ secrets.GITHUB_TOKEN }}
36+
tag: ${{ steps.compute-tag.outputs.tagname }}
37+
commit: main
38+
artifacts: './progit.epub,./progit.fb2.zip,./progit.mobi,./progit.pdf,./progit.html'

0 commit comments

Comments
 (0)