Skip to content

Commit

Permalink
Merge branch 'master' into v1
Browse files Browse the repository at this point in the history
  • Loading branch information
beta-ziliani committed Mar 23, 2023
2 parents 87a1c8a + aa07aeb commit d60c951
Show file tree
Hide file tree
Showing 6 changed files with 70 additions and 28 deletions.
30 changes: 30 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:base"],
"separateMajorMinor": false,
"pip-compile": {
"fileMatch": ["(^|/)requirements\\.in$"]
},
"pip_requirements": {
"enabled": false
},
"packageRules": [
{
"groupName": "Main NPM deps",
"matchPaths": ["+(package*.json)"],
"lockFileMaintenance": {"enabled": true},
"schedule": ["after 5am and before 8am on the first day of the month"]
},
{
"groupName": "Docs Python deps",
"matchManagers": ["pip-compile"],
"matchFiles": ["docs/requirements.in"],
"schedule": ["after 5am and before 8am on the first day of the month"]
},
{
"groupName": "GH Actions",
"matchManagers": ["github-actions"],
"schedule": ["after 5am and before 8am on the first day of the month"]
}
]
}
4 changes: 3 additions & 1 deletion .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ jobs:
- name: Download source
uses: actions/checkout@v3
- name: Install Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.11'
- name: Install dependencies
run: pip install --no-deps -r docs/requirements.txt
- name: Fetch branch
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ steps:
```yaml
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: crystal-lang/install-crystal@v1
with:
crystal: 1.2
Expand All @@ -41,7 +41,7 @@ steps:
- uses: crystal-lang/install-crystal@v1
with:
crystal: ${{matrix.crystal}}
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: shards install
- run: crystal spec
- run: crystal tool format && git diff --exit-code
Expand Down
4 changes: 2 additions & 2 deletions docs/configurator.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
{%- endif %}
steps:
- name: Download source
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install Crystal
uses: crystal-lang/install-crystal@v1
{%- if crystal_nightly or crystal_ver %}
Expand All @@ -94,7 +94,7 @@ jobs:
{%- endif %}
{%- if cache_shards %}
- name: Cache shards
uses: actions/cache@v2
uses: actions/cache@v3
with:
{%- if is_app %}
path: lib
Expand Down
46 changes: 26 additions & 20 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
#
# This file is autogenerated by pip-compile with python 3.10
# This file is autogenerated by pip-compile with python 3.11
# To update, run:
#
# pip-compile docs/requirements.in
# pip-compile requirements.in
#
certifi==2022.9.24
# via requests
charset-normalizer==2.1.1
# via requests
click==8.1.3
# via mkdocs
ghp-import==2.1.0
# via mkdocs
importlib-metadata==4.11.4
# via mkdocs
idna==3.4
# via requests
jinja2==3.1.2
# via
# mkdocs
Expand All @@ -24,30 +28,30 @@ markupsafe==2.1.1
# via jinja2
mergedeep==1.3.4
# via mkdocs
mkdocs==1.3.0
mkdocs==1.4.2
# via
# -r docs/requirements.in
# -r requirements.in
# mkdocs-gen-files
# mkdocs-macros-plugin
# mkdocs-material
# mkdocs-same-dir
mkdocs-gen-files==0.3.4
# via -r docs/requirements.in
mkdocs-gen-files==0.4.0
# via -r requirements.in
mkdocs-macros-plugin==0.7.0
# via -r docs/requirements.in
mkdocs-material==8.3.6
# via -r docs/requirements.in
mkdocs-material-extensions==1.0.3
# via -r requirements.in
mkdocs-material==8.5.10
# via -r requirements.in
mkdocs-material-extensions==1.1
# via mkdocs-material
mkdocs-same-dir==0.1.1
# via -r docs/requirements.in
mkdocs-same-dir==0.1.2
# via -r requirements.in
packaging==21.3
# via mkdocs
pygments==2.12.0
pygments==2.13.0
# via mkdocs-material
pymdown-extensions==9.5
pymdown-extensions==9.8
# via
# -r docs/requirements.in
# -r requirements.in
# mkdocs-material
pyparsing==3.0.9
# via packaging
Expand All @@ -62,11 +66,13 @@ pyyaml==6.0
# pyyaml-env-tag
pyyaml-env-tag==0.1
# via mkdocs
requests==2.28.1
# via mkdocs-material
six==1.16.0
# via python-dateutil
termcolor==1.1.0
termcolor==2.1.0
# via mkdocs-macros-plugin
urllib3==1.26.12
# via requests
watchdog==2.1.9
# via mkdocs
zipp==3.8.0
# via importlib-metadata
10 changes: 7 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,13 @@ async function installCrystalForLinux({crystal, shards, arch = getArch(), path})
const filePatterns = {"x86_64": /-linux-x86_64\.tar\.gz$/, "x86": /-linux-i686\.tar\.gz$/};
checkArch(arch, Object.keys(filePatterns));

const depsTask = installAptPackages(
"libevent-dev libgmp-dev libpcre3-dev libssl-dev libxml2-dev libyaml-dev".split(" "),
);
let packages = "libevent-dev libgmp-dev libpcre3-dev libssl-dev libxml2-dev libyaml-dev".split(" ");
if (crystal === Latest || crystal === Nightly || cmpTags(crystal, "1.8") >= 0) {
packages.push("libpcre2-dev");
}

const depsTask = installAptPackages(packages);

await installBinaryRelease({crystal, shards, filePattern: filePatterns[arch], path});

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

0 comments on commit d60c951

Please sign in to comment.