Skip to content

Commit d60c951

Browse files
committed
Merge branch 'master' into v1
2 parents 87a1c8a + aa07aeb commit d60c951

File tree

6 files changed

+70
-28
lines changed

6 files changed

+70
-28
lines changed

.github/renovate.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": ["config:base"],
4+
"separateMajorMinor": false,
5+
"pip-compile": {
6+
"fileMatch": ["(^|/)requirements\\.in$"]
7+
},
8+
"pip_requirements": {
9+
"enabled": false
10+
},
11+
"packageRules": [
12+
{
13+
"groupName": "Main NPM deps",
14+
"matchPaths": ["+(package*.json)"],
15+
"lockFileMaintenance": {"enabled": true},
16+
"schedule": ["after 5am and before 8am on the first day of the month"]
17+
},
18+
{
19+
"groupName": "Docs Python deps",
20+
"matchManagers": ["pip-compile"],
21+
"matchFiles": ["docs/requirements.in"],
22+
"schedule": ["after 5am and before 8am on the first day of the month"]
23+
},
24+
{
25+
"groupName": "GH Actions",
26+
"matchManagers": ["github-actions"],
27+
"schedule": ["after 5am and before 8am on the first day of the month"]
28+
}
29+
]
30+
}

.github/workflows/deploy-docs.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ jobs:
1515
- name: Download source
1616
uses: actions/checkout@v3
1717
- name: Install Python
18-
uses: actions/setup-python@v2
18+
uses: actions/setup-python@v4
19+
with:
20+
python-version: '3.11'
1921
- name: Install dependencies
2022
run: pip install --no-deps -r docs/requirements.txt
2123
- name: Fetch branch

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ steps:
1919
2020
```yaml
2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
2323
- uses: crystal-lang/install-crystal@v1
2424
with:
2525
crystal: 1.2
@@ -41,7 +41,7 @@ steps:
4141
- uses: crystal-lang/install-crystal@v1
4242
with:
4343
crystal: ${{matrix.crystal}}
44-
- uses: actions/checkout@v2
44+
- uses: actions/checkout@v3
4545
- run: shards install
4646
- run: crystal spec
4747
- run: crystal tool format && git diff --exit-code

docs/configurator.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
{%- endif %}
8686
steps:
8787
- name: Download source
88-
uses: actions/checkout@v2
88+
uses: actions/checkout@v3
8989
- name: Install Crystal
9090
uses: crystal-lang/install-crystal@v1
9191
{%- if crystal_nightly or crystal_ver %}
@@ -94,7 +94,7 @@ jobs:
9494
{%- endif %}
9595
{%- if cache_shards %}
9696
- name: Cache shards
97-
uses: actions/cache@v2
97+
uses: actions/cache@v3
9898
with:
9999
{%- if is_app %}
100100
path: lib

docs/requirements.txt

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
#
2-
# This file is autogenerated by pip-compile with python 3.10
2+
# This file is autogenerated by pip-compile with python 3.11
33
# To update, run:
44
#
5-
# pip-compile docs/requirements.in
5+
# pip-compile requirements.in
66
#
7+
certifi==2022.9.24
8+
# via requests
9+
charset-normalizer==2.1.1
10+
# via requests
711
click==8.1.3
812
# via mkdocs
913
ghp-import==2.1.0
1014
# via mkdocs
11-
importlib-metadata==4.11.4
12-
# via mkdocs
15+
idna==3.4
16+
# via requests
1317
jinja2==3.1.2
1418
# via
1519
# mkdocs
@@ -24,30 +28,30 @@ markupsafe==2.1.1
2428
# via jinja2
2529
mergedeep==1.3.4
2630
# via mkdocs
27-
mkdocs==1.3.0
31+
mkdocs==1.4.2
2832
# via
29-
# -r docs/requirements.in
33+
# -r requirements.in
3034
# mkdocs-gen-files
3135
# mkdocs-macros-plugin
3236
# mkdocs-material
3337
# mkdocs-same-dir
34-
mkdocs-gen-files==0.3.4
35-
# via -r docs/requirements.in
38+
mkdocs-gen-files==0.4.0
39+
# via -r requirements.in
3640
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 -r requirements.in
42+
mkdocs-material==8.5.10
43+
# via -r requirements.in
44+
mkdocs-material-extensions==1.1
4145
# via mkdocs-material
42-
mkdocs-same-dir==0.1.1
43-
# via -r docs/requirements.in
46+
mkdocs-same-dir==0.1.2
47+
# via -r requirements.in
4448
packaging==21.3
4549
# via mkdocs
46-
pygments==2.12.0
50+
pygments==2.13.0
4751
# via mkdocs-material
48-
pymdown-extensions==9.5
52+
pymdown-extensions==9.8
4953
# via
50-
# -r docs/requirements.in
54+
# -r requirements.in
5155
# mkdocs-material
5256
pyparsing==3.0.9
5357
# via packaging
@@ -62,11 +66,13 @@ pyyaml==6.0
6266
# pyyaml-env-tag
6367
pyyaml-env-tag==0.1
6468
# via mkdocs
69+
requests==2.28.1
70+
# via mkdocs-material
6571
six==1.16.0
6672
# via python-dateutil
67-
termcolor==1.1.0
73+
termcolor==2.1.0
6874
# via mkdocs-macros-plugin
75+
urllib3==1.26.12
76+
# via requests
6977
watchdog==2.1.9
7078
# via mkdocs
71-
zipp==3.8.0
72-
# via importlib-metadata

index.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,13 @@ async function installCrystalForLinux({crystal, shards, arch = getArch(), path})
120120
const filePatterns = {"x86_64": /-linux-x86_64\.tar\.gz$/, "x86": /-linux-i686\.tar\.gz$/};
121121
checkArch(arch, Object.keys(filePatterns));
122122

123-
const depsTask = installAptPackages(
124-
"libevent-dev libgmp-dev libpcre3-dev libssl-dev libxml2-dev libyaml-dev".split(" "),
125-
);
123+
let packages = "libevent-dev libgmp-dev libpcre3-dev libssl-dev libxml2-dev libyaml-dev".split(" ");
124+
if (crystal === Latest || crystal === Nightly || cmpTags(crystal, "1.8") >= 0) {
125+
packages.push("libpcre2-dev");
126+
}
127+
128+
const depsTask = installAptPackages(packages);
129+
126130
await installBinaryRelease({crystal, shards, filePattern: filePatterns[arch], path});
127131

128132
Core.info("Setting up environment for Crystal");

0 commit comments

Comments
 (0)