Merge branch 'master' into aws

.github/workflows/deploy-book.yml

@@ -12,8 +12,18 @@ jobs:
     steps:
       - name: Download source
         uses: actions/checkout@v2
+      - name: Extract branch name to deploy
+        id: branch
+        shell: bash -x {0}
+        run: |
+          if [[ ${GITHUB_BASE_REF:-$GITHUB_REF} =~ ^(refs/heads/)?(master|release/[0-9][0-9.]+)$ ]]; then
+            echo "::set-output name=branch::${BASH_REMATCH[2]#release/}"
+          fi
       - name: Install Crystal
+        id: crystal
         uses: crystal-lang/install-crystal@v1
+        with:
+          crystal: ${{ steps.branch.outputs.branch }}
       - name: Install Python
         uses: actions/setup-python@v2
       - name: Cache dependencies
@@ -24,17 +34,16 @@ jobs:
           restore-keys: pip-
       - name: Install dependencies
         run: make deps
-      - name: Build book
-        run: LINT=true make build
-      - name: Disallow unchecked intra-site links
-        run: make check_internal_links
-      - name: Extract branch name to deploy
-        id: branch
+      - name: Determine a version for API doc links
         shell: bash -x {0}
         run: |
-          if [[ $GITHUB_REF =~ ^refs/heads/(master|[0-9][0-9.]+)$ ]]; then
-            echo "::set-output name=branch::${BASH_REMATCH[1]}"
+          if [[ '${{ steps.branch.outputs.branch }}' =~ ^[0-9] ]]; then
+            echo "CRYSTAL_VERSION=${{ steps.crystal.outputs.crystal }}" >> ${GITHUB_ENV}
           fi
+      - name: Populate sample version of Crystal
+        run: crystal --version | tee crystal-version.txt
+      - name: Build book
+        run: LINT=true make build
       - name: Configure AWS Credentials
         if: github.event_name == 'push' && steps.branch.outputs.branch != null && github.repository == 'crystal-lang/crystal-book'
         uses: aws-actions/configure-aws-credentials@v1

Makefile

@@ -73,16 +73,7 @@ clean_all: clean clean_deps clean_vendor
 
 .PHONY: format_api_docs_links
 format_api_docs_links:
-	echo $(DOCS_FILES) | xargs sed -i -E -e 's|https?://(www\.)?crystal-lang.org/api/([A-Z])|https://crystal-lang.org/api/latest/\2|g'
-
-.PHONY: check_internal_links
-check_internal_links: $(DOCS_FILES)
-	if grep -P '\[\w.*?\]\((?!http)[^ )]*?(\.html|/)(#[^ )]*?)?\)' docs/**/*.md; then \
-		echo "Links within the site must end with .md"; exit 1; \
-	fi
-	if grep -P '\]\(/|//crystal-lang.org/reference/' docs/**/*.md; then \
-		echo "Absolute links within the site are disallowed, use relative links instead"; exit 1; \
-	fi
+	echo $(DOCS_FILES) | xargs sed -i -E -e 's@\bhttps?://(www\.)?crystal-lang\.org/api/([0-9]+(\.[0-9]+)+|latest|master)/([^ )]+\.html)\b@https://crystal-lang.org/api/\4@g'
 
 .PHONY: help
 help: ## Show this help

crystal-version.txt

@@ -1,4 +1,4 @@
-Crystal 1.2.2 [6529d725a] (2021-11-10)
+Crystal 1.3.0 [a3ee70ca0] (2022-01-06)
 
 LLVM: 10.0.0
 Default target: x86_64-unknown-linux-gnu

docs/SUMMARY.md

@@ -92,6 +92,7 @@
         * [as](syntax_and_semantics/as.md)
         * [as?](syntax_and_semantics/as_question.md)
         * [typeof](syntax_and_semantics/typeof.md)
+    * [Type autocasting](syntax_and_semantics/autocasting.md)
     * [Macros](syntax_and_semantics/macros/README.md)
         * [Macro methods](syntax_and_semantics/macros/macro_methods.md)
         * [Hooks](syntax_and_semantics/macros/hooks.md)

docs/assets/style.css

@@ -37,7 +37,7 @@
     margin: 0;
 }
 .card > ul {
-    display: flex;
+    display: flex !important;
     flex-wrap: wrap;
     list-style: none;
     padding: 0;

docs/database/connection_pool.md

@@ -52,17 +52,16 @@ If a connection is lost or can't be established retry at most `retry_attempts` t
 
 The following program will print the current time from MySQL but if the connection is lost or the whole server is down for a few seconds the program will still run without raising exceptions.
 
-!!! example "sample.cr"
-    ```crystal
-    require "mysql"
-
-    DB.open "mysql://root@localhost?retry_attempts=8&retry_delay=3" do |db|
-      loop do
-        pp db.scalar("SELECT NOW()")
-        sleep 0.5
-      end
-    end
-    ```
+```crystal title="sample.cr"
+require "mysql"
+
+DB.open "mysql://root@localhost?retry_attempts=8&retry_delay=3" do |db|
+  loop do
+    pp db.scalar("SELECT NOW()")
+    sleep 0.5
+  end
+end
+```
 
 ```console
 $ crystal sample.cr

docs/getting_started/README.md

@@ -50,10 +50,9 @@ More details about using the compiler can be found on the manpage `man crystal`
 
 The following example is the classic Hello World. In Crystal it looks like this:
 
-!!! example "hello_world.cr"
-    ```crystal
-    puts "Hello World!"
-    ```
+```crystal title="hello_world.cr"
+puts "Hello World!"
+```
 
 We may run our example like this: