Upstream changes, master branch now become main

Author: wencywww

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: Translation bug
-    url: https://github.com/progit/progit2/blob/master/TRANSLATING.md
+    url: https://github.com/progit/progit2/blob/main/TRANSLATING.md
     about: Refer to this table to find out where to report translation bugs.
 
   - name: Report bugs for git-scm.com site

.github/pull_request_template.md

@@ -3,7 +3,7 @@
 <!-- Should your changes appear in a printed edition, you'll be included in the contributors list. -->
 
 <!-- Mark the checkbox [X] or [x] if you agree with the item. -->
-- [ ] I provide my work under the [project license](https://github.com/progit/progit2/blob/master/LICENSE.asc).
+- [ ] I provide my work under the [project license](https://github.com/progit/progit2/blob/main/LICENSE.asc).
 - [ ] 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).
 
 ## Changes

.github/workflows/pr-build.yml

@@ -0,0 +1,20 @@
+name: Pull Request Build
+
+on:
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+    - name: Build book
+      run: bundle exec rake book:build

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

@@ -0,0 +1,38 @@
+name: Release on push to main
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Compute tag name
+      id: compute-tag
+      run: |
+        echo Computing next tag number
+        LASTPATCH=$(git describe --tags | cut -d- -f1 | cut -d. -f3)
+        PATCH=$(($LASTPATCH+1))
+        echo "::set-output name=tagname::2.1.${PATCH}"
+
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+    - name: Build release assets
+      run: bundle exec rake book:build
+
+    - name: Create release
+      uses: ncipollo/release-action@v1
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        tag: ${{ steps.compute-tag.outputs.tagname }}
+        commit: main
+        artifacts: './progit.epub,./progit.mobi,./progit.pdf,./progit.html'

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rake', '13.0.3'
+gem 'rake', '13.0.6'
 gem 'asciidoctor', '2.0.15'
 
 gem 'json', '2.5.1'
@@ -14,3 +14,4 @@ gem 'pygments.rb', '2.2.0'
 gem 'thread_safe', '0.3.6'
 gem 'epubcheck-ruby', '4.2.5.0'
 gem 'html-proofer', '3.19.2'
+gem 'kindlegen', '3.1.1'

README.asc

@@ -6,8 +6,8 @@
 
 Подобно на първото издание на книгата и текущото такова е с отворен код, лицензирано според Creative Commons лиценза.
 
-Няколко неща са променени в сравнение с първото издание.
-Например, за текста на книгата ние вече използваме чудесния AsciiDoc формат вместо Markdown; можете да видите https://asciidoctor.org/docs/asciidoc-syntax-quick-reference/[AsciiDoc бързия справочник].
+Няколко неща са променени от момента, в който първото издание стана с отворен код.
+Например, за текста на книгата вече използваме чудесния AsciiDoc формат вместо Markdown; можете да видите https://docs.asciidoctor.org/asciidoc/latest/syntax-quick-reference/[AsciiDoc бързия справочник].
 
 Също така, вместо в отделни директории на английското хранилище, вече съхраняваме преводите в отделни самостоятелни хранилища за всеки език.
 Погледнете link:TRANSLATING.md[указанията за сътрудничество] за повече информация.

Rakefile

@@ -1,13 +1,7 @@
 namespace :book do
-  def exec_or_raise(command)
-    puts `#{command}`
-    if (! $?.success?)
-      raise "'#{command}' failed"
-    end
-  end
 
   # Variables referenced for build
-  version_string = ENV['TRAVIS_TAG'] || `git describe --tags`.chomp
+  version_string = `git describe --tags`.chomp
   if version_string.empty?
     version_string = '0'
   end
@@ -28,7 +22,7 @@ namespace :book do
         puts "Hash on header of contributors list (#{header_hash}) matches the current HEAD (#{current_head_hash})"
       else
         puts "Hash on header of contributors list (#{header_hash}) does not match the current HEAD (#{current_head_hash}), refreshing"
-        `rm book/contributors.txt`
+        sh "rm book/contributors.txt"
         # Reenable and invoke task again
         Rake::Task['book/contributors.txt'].reenable
         Rake::Task['book/contributors.txt'].invoke
@@ -58,16 +52,16 @@ namespace :book do
   desc 'generate contributors list'
   file 'book/contributors.txt' do
       puts 'Generating contributors list'
-      `echo "Contributors as of #{header_hash}:\n" > book/contributors.txt`
-      `git shortlog -s | grep -v -E "(Straub|Chacon|dependabot)" | cut -f 2- | column -c 120 >> book/contributors.txt`
+      sh "echo 'Contributors as of #{header_hash}:\n' > book/contributors.txt"
+      sh "git shortlog -s | grep -v -E '(Straub|Chacon|dependabot)' | cut -f 2- | column -c 120 >> book/contributors.txt"
   end
 
   desc 'build HTML format'
   task :build_html => 'book/contributors.txt' do
       check_contrib()
 
       puts 'Converting to HTML...'
-      `bundle exec asciidoctor #{params} -a data-uri progit.asc`
+      sh "bundle exec asciidoctor #{params} -a data-uri progit.asc"
       puts ' -- HTML output at progit.html'
 
   end
@@ -77,7 +71,7 @@ namespace :book do
       check_contrib()
 
       puts 'Converting to EPub...'
-      `bundle exec asciidoctor-epub3 #{params} progit.asc`
+      sh "bundle exec asciidoctor-epub3 #{params} progit.asc"
       puts ' -- Epub output at progit.epub'
 
   end
@@ -87,7 +81,7 @@ namespace :book do
       check_contrib()
 
       puts "Converting to Mobi (kf8)..."
-      `bundle exec asciidoctor-epub3 #{params} -a ebook-format=kf8 progit.asc`
+      sh "bundle exec asciidoctor-epub3 #{params} -a ebook-format=kf8 progit.asc"
       puts " -- Mobi output at progit.mobi"
   end
 
@@ -96,16 +90,16 @@ namespace :book do
       check_contrib()
 
       puts 'Converting to PDF... (this one takes a while)'
-      `bundle exec asciidoctor-pdf #{params} progit.asc 2>/dev/null`
+      sh "bundle exec asciidoctor-pdf #{params} progit.asc 2>/dev/null"
       puts ' -- PDF output at progit.pdf'
   end
 
   desc 'Check generated books'
   task :check => [:build_html, :build_epub] do
       puts 'Checking generated books'
 
-      exec_or_raise('htmlproofer --check-html progit.html')
-      exec_or_raise('epubcheck progit.epub')
+      sh "htmlproofer --check-html progit.html"
+      sh "epubcheck progit.epub"
   end
 
   desc 'Clean all generated files'

TRANSLATING.md

@@ -72,22 +72,13 @@ On https://git-scm.com, the translations are divided into three categories. Once
 | Partial translations available in | up to chapter 6 has been translated. |
 | Full translation available in |the book is (almost) fully translated. |
 
-## Continuous integration with Travis CI
+## Continuous integration with GitHub Actions
 
-Travis CI is a [continuous integration](https://en.wikipedia.org/wiki/Continuous_integration) service that integrates with GitHub. Travis CI is used to ensure that a pull-request doesn't break the build or compilation. Travis CI can also provide compiled versions of the book.
+GitHub Actions is a [continuous integration](https://en.wikipedia.org/wiki/Continuous_integration) service that integrates with GitHub. GitHub Actions is used to ensure that a pull-request doesn't break the build or compilation. GitHub Actions can also provide compiled versions of the book.
 
-Setting up Travis CI requires administrative control over the repository.
-
-### Registering for Travis continuous integration
-
-1. Register a Travis account [here](https://travis-ci.org/).
-1. Register your project in Travis.
-Please refer to the [Travis documentation](https://docs.travis-ci.com/) for more information.
-
-### Setting up your repository for continuous integration
-
-Travis CI works by scanning your project's root directory for a file named `.travis.yml` and following the 'recipe' that it contains. The good news is: there's already a working `.travis.yml` file in the Pro Git 2 source [here](https://raw.githubusercontent.com/progit/progit2-pub/master/travis.yml).
-Copy that file, and put it in your working directory. Commit the .yml file and push it to your translation repository; that should fire up a compilation and a check of the book's contents.
+The configuration for GitHub Actions is contained in the `.github/workflows` directory, and if you bring in the `main` branch of the root repository you'll get them for free.
+However, if you created your translation repo by _forking_ the root repo, there's an extra step you must complete (if you did not fork, you can skip this part).
+GitHub assumes that forks will be used to contribute to the repo from which they were forked, so you'll have to visit the "Actions" tab on your forked repo, and click the "I understand my workflows" button to allow the actions to run.
 
 ## Setting up a publication chain for e-books
 

atlas.json

@@ -1,5 +1,5 @@
 {
-  "branch": "master",
+  "branch": "main",
   "files": [
     "book/cover.html",
     "LICENSE.asc",

book/07-git-tools/sections/credentials.asc

@@ -174,7 +174,7 @@ include::../git-credential-read-only[]
 <3> Цикълът чете вход от stdin докато срещне празен ред.
     Подадените стойности се пазят в `known` хеша за по-късно ползване.
 <4> Този цикъл чете съдържанието на storage файла, търсейки съвпадения.
-    Ако протоколът и хостът от `known` съответстват на дадения ред, програмата печата резултатите в stdout и спира.
+    Ако протоколът, хостът и потребителското име от `known` съответстват на дадения ред, програмата печата резултатите в stdout и спира.
 
 Ще запишем нашия helper като `git-credential-read-only`, ще го добавим към `PATH` променливата и ще го направим изпълним.
 Ето как изглежда интерактивната сесия:
@@ -184,6 +184,7 @@ include::../git-credential-read-only[]
 $ git credential-read-only --file=/mnt/shared/creds get
 protocol=https
 host=mygithost
+username=bob
 
 protocol=https
 host=mygithost