Skip to content

Commit 27c9655

Browse files
committed
Merge branch 'master' into v1
2 parents 822c1ae + b4ca66b commit 27c9655

File tree

12 files changed

+1620
-1259
lines changed

12 files changed

+1620
-1259
lines changed

.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"SharedArrayBuffer": "readonly"
1212
},
1313
"parserOptions": {
14-
"ecmaVersion": 2018
14+
"ecmaVersion": 2020,
15+
"sourceType": "module"
1516
},
1617
"rules": {
1718
"no-empty": ["error", {"allowEmptyCatch": true}],

.github/workflows/deploy-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Download source
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717
- name: Install Python
1818
uses: actions/setup-python@v2
1919
- name: Install dependencies
20-
run: pip install -r docs/requirements.txt
20+
run: pip install --no-deps -r docs/requirements.txt
2121
- name: Fetch branch
2222
run: git fetch origin v1:v1
2323
- name: Build site

.github/workflows/main.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,20 @@ jobs:
2020
- {shards: false}
2121
- {shards: true}
2222
- {shards: '0.12.0', crystal: '0.35.1'}
23-
- {shards: '0.14', crystal: '1.2'}
23+
- {shards: '0.14', crystal: '1.3'}
2424
- {shards: latest, crystal: latest}
2525
- {shards: nightly, crystal: nightly}
2626
exclude:
2727
- os: windows-latest
2828
config: {shards: '0.12.0', crystal: '0.35.1'}
29-
- os: windows-latest
30-
config: {shards: '0.14', crystal: '1.2'}
31-
- os: windows-latest
32-
config: {shards: latest, crystal: latest}
3329

3430
name: crystal ${{ matrix.config.crystal }} + shards ${{ matrix.config.shards }} (${{ matrix.os }})
3531
runs-on: ${{ matrix.os }}
3632
defaults:
3733
run:
3834
shell: bash
3935
steps:
40-
- uses: actions/checkout@v2
36+
- uses: actions/checkout@v3
4137
- run: npm install --only=prod
4238
- uses: ./
4339
with: ${{ matrix.config }}
@@ -86,7 +82,7 @@ jobs:
8682
test:
8783
runs-on: ubuntu-latest
8884
steps:
89-
- uses: actions/checkout@v2
85+
- uses: actions/checkout@v3
9086
- run: npm install
9187
- run: npm test
9288
- run: npm audit --audit-level=moderate --only=prod

.github/workflows/release.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,20 @@ jobs:
2020
- {shards: false}
2121
- {shards: true}
2222
- {shards: '0.12.0', crystal: '0.35.1'}
23-
- {shards: '0.14', crystal: '1.2'}
23+
- {shards: '0.14', crystal: '1.3'}
2424
- {shards: latest, crystal: latest}
2525
- {shards: nightly, crystal: nightly}
2626
exclude:
2727
- os: windows-latest
2828
config: {shards: '0.12.0', crystal: '0.35.1'}
29-
- os: windows-latest
30-
config: {shards: '0.14', crystal: '1.2'}
31-
- os: windows-latest
32-
config: {shards: latest, crystal: latest}
3329

3430
name: crystal ${{ matrix.config.crystal }} + shards ${{ matrix.config.shards }} (${{ matrix.os }})
3531
runs-on: ${{ matrix.os }}
3632
defaults:
3733
run:
3834
shell: bash
3935
steps:
40-
- uses: actions/checkout@v2
36+
- uses: actions/checkout@v3
4137

4238
- uses: crystal-lang/install-crystal@v1
4339
with: ${{ matrix.config }}

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ Alternatively, you can use the container-based approach [as in the starter workf
5656
5757
### Inputs
5858
59-
* * **`crystal: 1.1.0`**, **`crystal: 1.2`** (not supported on Windows)
59+
* * **`crystal: 1.1.0`**, **`crystal: 1.2`**
6060

6161
Install a particular release of Crystal (if the full version is specified), or the latest patch version of a release series.
6262

63-
* **`crystal: latest`** (default; not supported on Windows)
63+
* **`crystal: latest`** (default)
6464

6565
Install the latest released version of Crystal.
6666

67-
* **`crystal: nightly`** (default on Windows)
67+
* **`crystal: nightly`**
6868

6969
Install Crystal from the latest continuous build on [crystal.git][] master.
7070

action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ outputs:
2222
path:
2323
description: The directory where Crystal was installed
2424
runs:
25-
using: node12
25+
using: node16
2626
main: index.js
2727
branding:
2828
icon: octagon

docs/configurator.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ jobs:
107107
{%- endif %}
108108
- name: Install shards
109109
{%- if is_app %}
110-
run: {% if cache_shards %}shards check || {% endif %}shards install --ignore-crystal-version
110+
run: {% if cache_shards %}shards check || {% endif %}shards install{% if crystal_ver %} --ignore-crystal-version{% endif %}
111111
{%- else %}
112-
run: shards update --ignore-crystal-version
112+
run: shards update{% if crystal_ver %} --ignore-crystal-version{% endif %}
113113
{%- endif %}
114114
- name: Run tests
115115
run: crystal spec --order=random

docs/requirements.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
mkdocs>=1.1.2
2+
mkdocs-gen-files>=0.3.2
3+
mkdocs-macros-plugin>=0.5.5
4+
mkdocs-material>=7.1.4
5+
mkdocs-same-dir>=0.1.0
6+
pymdown-extensions>=8.2

docs/requirements.txt

Lines changed: 72 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,72 @@
1-
mkdocs>=1.1.2
2-
mkdocs-gen-files>=0.3.2
3-
mkdocs-macros-plugin>=0.5.5
4-
mkdocs-material>=7.1.4
5-
mkdocs-same-dir>=0.1.0
6-
pymdown-extensions>=8.2
1+
#
2+
# This file is autogenerated by pip-compile with python 3.10
3+
# To update, run:
4+
#
5+
# pip-compile docs/requirements.in
6+
#
7+
click==8.1.3
8+
# via mkdocs
9+
ghp-import==2.1.0
10+
# via mkdocs
11+
importlib-metadata==4.11.4
12+
# via mkdocs
13+
jinja2==3.1.2
14+
# via
15+
# mkdocs
16+
# mkdocs-macros-plugin
17+
# mkdocs-material
18+
markdown==3.3.7
19+
# via
20+
# mkdocs
21+
# mkdocs-material
22+
# pymdown-extensions
23+
markupsafe==2.1.1
24+
# via jinja2
25+
mergedeep==1.3.4
26+
# via mkdocs
27+
mkdocs==1.3.0
28+
# via
29+
# -r docs/requirements.in
30+
# mkdocs-gen-files
31+
# mkdocs-macros-plugin
32+
# mkdocs-material
33+
# mkdocs-same-dir
34+
mkdocs-gen-files==0.3.4
35+
# via -r docs/requirements.in
36+
mkdocs-macros-plugin==0.7.0
37+
# via -r docs/requirements.in
38+
mkdocs-material==8.3.6
39+
# via -r docs/requirements.in
40+
mkdocs-material-extensions==1.0.3
41+
# via mkdocs-material
42+
mkdocs-same-dir==0.1.1
43+
# via -r docs/requirements.in
44+
packaging==21.3
45+
# via mkdocs
46+
pygments==2.12.0
47+
# via mkdocs-material
48+
pymdown-extensions==9.5
49+
# via
50+
# -r docs/requirements.in
51+
# mkdocs-material
52+
pyparsing==3.0.9
53+
# via packaging
54+
python-dateutil==2.8.2
55+
# via
56+
# ghp-import
57+
# mkdocs-macros-plugin
58+
pyyaml==6.0
59+
# via
60+
# mkdocs
61+
# mkdocs-macros-plugin
62+
# pyyaml-env-tag
63+
pyyaml-env-tag==0.1
64+
# via mkdocs
65+
six==1.16.0
66+
# via python-dateutil
67+
termcolor==1.1.0
68+
# via mkdocs-macros-plugin
69+
watchdog==2.1.9
70+
# via mkdocs
71+
zipp==3.8.0
72+
# via importlib-metadata

0 commit comments

Comments
 (0)