Skip to content

Commit 619ca22

Browse files
Cpt-xxcpt
Cpt-xx
and
cpt
authored
Repair build scripts (#33)
* Reparatie poging Verwijder scripts die niet meer in progit2 staan Neem wijzigingen in gelijknamige scripts in progit2 over Neem nieuwe bestanden over uit progit2 * Reparatie poging Neem nieuwe bestanden over uit progit2 --------- Co-authored-by: cpt <donotmail@github.com>
1 parent 5841e75 commit 619ca22

17 files changed

Lines changed: 361 additions & 187 deletions

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

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/enhancement_idea.yml‎

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/workflows/pr-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ name: Pull Request Build
22

33
on:
44
pull_request:
5-
branches: [ main, master ]
5+
branches: [ main ]
66

77
jobs:
88
build:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212

1313
- name: Set up Ruby
1414
uses: ruby/setup-ruby@v1

‎.github/workflows/release-on-merge.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ name: Release on push to main
22

33
on:
44
push:
5-
branches: [ main, master ]
5+
branches: [ main ]
66

77
jobs:
88
release:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
with:
1313
fetch-depth: 0
1414

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ output
22
.DS_Store
33

44
# build artifacts
5-
Gemfile.lock
65
progit.html
76
progit.pdf
87
progit.pdfmarks
98
progit.epub
9+
progit.fb2.zip
1010
progit-kf8.epub
1111
progit.mobi
1212
contributors.txt

‎.tgitconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[bugtraq]
22
url = https://github.com/progit/progit2/issues/%BUGID%
3-
logregex = "[Ii]ssues?:?(\\s*(,|and)?\\s*#?\\d+)+\n(\\d+)"
3+
logregex = "(?:[Cc]lose[sd]?|[Ff]ix(?:e[sd])?|[Rr]esolve[sd]?):?\\s+(?:[Ii]ssues?\\s+#?|#)\\d+(?:(?:,|\\s+and)\\s+(?:[Ii]ssues?\\s+#?|#)\\d+)*\n(\\d+)"
44

55
[tgit]
66
icon = Pro.ico

‎.travis.yml‎

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

‎CITATION.cff‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# This CITATION.cff file was generated with cffinit.
2+
# Visit https://bit.ly/cffinit to generate yours today!
3+
4+
cff-version: 1.2.0
5+
title: Pro Git
6+
message: >-
7+
If you use this software, please cite it using the
8+
metadata from this file.
9+
type: software
10+
authors:
11+
- given-names: Scott
12+
family-names: Chacon
13+
email: schacon@gmail.com
14+
- given-names: Ben
15+
family-names: Straub
16+
email: ben@straub.cc
17+
identifiers:
18+
- type: url
19+
value: 'https://git-scm.com/book/en/v2'
20+
description: Pro Git website
21+
repository-code: 'https://github.com/progit/progit2'
22+
url: 'https://git-scm.com/book/en/v2'
23+
keywords:
24+
- git
25+
- book
26+
- asciidoc
27+
- pro-git
28+
license: CC-BY-NC-SA-3.0
29+
version: '2'

‎Gemfile‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
source 'https://rubygems.org'
22

3-
gem 'rake'
4-
gem 'asciidoctor', '1.5.8'
3+
gem 'rake', '13.1.0'
4+
gem 'asciidoctor', '2.0.21'
55

6-
gem 'json'
7-
gem 'awesome_print'
6+
gem 'json', '2.6.3'
7+
gem 'awesome_print', '1.9.2'
88

9-
gem 'asciidoctor-epub3', :git => 'https://github.com/asciidoctor/asciidoctor-epub3'
10-
gem 'asciidoctor-pdf', '1.5.0.alpha.16'
9+
gem 'asciidoctor-fb2', '0.7.0'
10+
gem 'asciidoctor-epub3', '2.1.0'
11+
gem 'asciidoctor-pdf', '2.3.13'
1112

12-
gem 'coderay'
13-
gem 'pygments.rb'
14-
gem 'thread_safe'
15-
gem 'epubcheck'
16-
gem 'kindlegen'
13+
gem 'coderay', '1.1.3'
14+
gem 'pygments.rb', '2.4.1'
15+
gem 'thread_safe', '0.3.6'
16+
gem 'epubcheck-ruby', '5.1.0.0'
17+
gem 'html-proofer', '5.0.8'
18+
gem 'kindlegen', '3.1.1'

0 commit comments

Comments
 (0)