Merge branch 'master' into v1

Author: oprypin

.github/workflows/main.yml

@@ -20,11 +20,14 @@ jobs:
           - {shards: false}
           - {shards: true}
           - {shards: '0.12.0', crystal: '0.35.1'}
+          - {shards: '0.14', crystal: '1.2'}
           - {shards: latest, crystal: latest}
           - {shards: nightly, crystal: nightly}
         exclude:
           - os: windows-latest
             config: {shards: '0.12.0', crystal: '0.35.1'}
+          - os: windows-latest
+            config: {shards: '0.14', crystal: '1.2'}
           - os: windows-latest
             config: {shards: latest, crystal: latest}
 
@@ -46,31 +49,31 @@ jobs:
           crystal eval 'puts "test" + "ing"' | grep 'testing'
       - run: |
           '${{ steps.install.outputs.path }}/bin/crystal' --version
+        if: ${{ runner.os != 'Windows' }}
       - run: |
           ls '${{ steps.install.outputs.path }}/src/prelude.cr'
       - run: |
           v='${{ steps.install.outputs.crystal }}'
-          crystal --version | grep "${v:0:9}"
+          crystal --version | grep "${v:0:9}\\b"
         if: ${{ runner.os != 'Windows' }}
       - run: |
           v='${{ matrix.config.crystal }}'
-          crystal --version | grep "$v"
+          crystal --version | grep -E "${v}\\b"
         if: ${{ contains(matrix.config.crystal, '.') }}
       - run: |
-          crystal eval 'require "openssl"; require "yaml"; require "xml"; require "big"'
-        if: ${{ runner.os != 'Windows' }}
+          crystal eval 'require "yaml"; require "xml"; require "big"; require "openssl"'
 
       - run: |
           shards --version
         if: ${{ !contains('false', matrix.config.shards) }}
       - run: |
           v='${{ steps.install.outputs.shards }}'
           v="${v#v}"
-          shards --version | grep "${v:0:9}"
+          shards --version | grep -E "${v:0:9}\\b"
         if: ${{ !contains('true|false|nightly', matrix.config.shards) }}
       - run: |
           v='${{ matrix.config.shards }}'
-          shards --version | grep "$v"
+          shards --version | grep -E "${v}\\b"
         if: ${{ contains(matrix.config.shards, '.') }}
       - run: |
           ! shards --version

.github/workflows/release.yml

@@ -7,7 +7,7 @@ on:
 
 
   schedule:
-    - cron: '0 6 * * 6'
+    - cron: '0 6 * * *'
 
 jobs:
   try:
@@ -20,11 +20,14 @@ jobs:
           - {shards: false}
           - {shards: true}
           - {shards: '0.12.0', crystal: '0.35.1'}
+          - {shards: '0.14', crystal: '1.2'}
           - {shards: latest, crystal: latest}
           - {shards: nightly, crystal: nightly}
         exclude:
           - os: windows-latest
             config: {shards: '0.12.0', crystal: '0.35.1'}
+          - os: windows-latest
+            config: {shards: '0.14', crystal: '1.2'}
           - os: windows-latest
             config: {shards: latest, crystal: latest}
 
@@ -35,7 +38,7 @@ jobs:
         shell: bash
     steps:
       - uses: actions/checkout@v2
-      - run: npm install --only=prod
+
       - uses: crystal-lang/install-crystal@v1
         with: ${{ matrix.config }}
         id: install
@@ -46,31 +49,31 @@ jobs:
           crystal eval 'puts "test" + "ing"' | grep 'testing'
       - run: |
           '${{ steps.install.outputs.path }}/bin/crystal' --version
+        if: ${{ runner.os != 'Windows' }}
       - run: |
           ls '${{ steps.install.outputs.path }}/src/prelude.cr'
       - run: |
           v='${{ steps.install.outputs.crystal }}'
-          crystal --version | grep "${v:0:9}"
+          crystal --version | grep "${v:0:9}\\b"
         if: ${{ runner.os != 'Windows' }}
       - run: |
           v='${{ matrix.config.crystal }}'
-          crystal --version | grep "$v"
+          crystal --version | grep -E "${v}\\b"
         if: ${{ contains(matrix.config.crystal, '.') }}
       - run: |
-          crystal eval 'require "openssl"; require "yaml"; require "xml"; require "big"'
-        if: ${{ runner.os != 'Windows' }}
+          crystal eval 'require "yaml"; require "xml"; require "big"; require "openssl"'
 
       - run: |
           shards --version
         if: ${{ !contains('false', matrix.config.shards) }}
       - run: |
           v='${{ steps.install.outputs.shards }}'
           v="${v#v}"
-          shards --version | grep "${v:0:9}"
+          shards --version | grep -E "${v:0:9}\\b"
         if: ${{ !contains('true|false|nightly', matrix.config.shards) }}
       - run: |
           v='${{ matrix.config.shards }}'
-          shards --version | grep "$v"
+          shards --version | grep -E "${v}\\b"
         if: ${{ contains(matrix.config.shards, '.') }}
       - run: |
           ! shards --version

README.md

@@ -22,7 +22,7 @@ steps:
   - uses: actions/checkout@v2
   - uses: crystal-lang/install-crystal@v1
     with:
-      crystal: 0.35.1
+      crystal: 1.2
   - run: shards install
   - run: crystal spec
 ```
@@ -56,9 +56,9 @@ Alternatively, you can use the container-based approach [as in the starter workf
 
 ### Inputs
 
- *   *  **`crystal: 0.35.1`** (not supported on Windows)
+ *   *  **`crystal: 1.1.0`**, **`crystal: 1.2`** (not supported on Windows)
 
-        Install a particular release of Crystal.
+        Install a particular release of Crystal (if the full version is specified), or the latest patch version of a release series.
 
      *  **`crystal: latest`** (default; not supported on Windows)
 
@@ -81,9 +81,9 @@ Alternatively, you can use the container-based approach [as in the starter workf
 
         Build and install the latest released version of Shards.
 
-     *  **`shards: 0.13.0`**
+     *  **`shards: 0.14.0`**, **`shards: 0.16`**
 
-        Build and install a particular release of Shards.
+        Build and install a particular release of Shards (if the full version is specified), or the latest patch version of a release series.
 
      *  **`shards: nightly`**
 

action.yml

@@ -11,7 +11,6 @@ inputs:
     description: The directory to store Crystal in
   annotate:
     description: Display compilation and spec errors as GitHub code annotations
-    default: true
   token:
     description: Personal access token (auto-populated)
     default: ${{ github.token }}

docs/configurator.md

@@ -56,7 +56,7 @@ jobs:
           - os: ubuntu-latest
           {%- if crystal_ver %}
           - os: ubuntu-latest
-            crystal: 1.0.0
+            crystal: 1.2
           {%- endif %}
           {%- if crystal_nightly %}
           - os: ubuntu-latest
@@ -73,7 +73,7 @@ jobs:
         os: [ubuntu-latest{% if os_mac %}, macos-latest{% endif %}{% if os_win %}, windows-latest{% endif %}]
         {%- endif %}
         {%- if crystal_nightly or crystal_ver %}
-        crystal: [{% if crystal_ver %}1.0.0, {% endif %}latest{% if crystal_nightly %}, nightly{% endif %}]
+        crystal: [{% if crystal_ver %}1.2, {% endif %}latest{% if crystal_nightly %}, nightly{% endif %}]
         {%- endif %}
         {%- endif %}
     {%- endif %}