Skip to content

Commit 64582a5

Browse files
Merge branch 'master' into documentation-horizontal-autoscaling
2 parents 4c7cdcf + 53f6806 commit 64582a5

20 files changed

+235
-1979
lines changed

.github/workflows/cleanup_acceptance.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
jobs:
88
cleanup:
99
runs-on: ubuntu-latest
10-
container: quay.io/hypernode/deploy:3-php8.1-node18
10+
container: quay.io/hypernode/deploy:4-php8.3-node20
1111
environment: acceptance
1212
steps:
1313
- uses: actions/checkout@v2

.github/workflows/deploy.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
jobs:
1313
build:
1414
runs-on: ubuntu-latest
15-
container: quay.io/hypernode/deploy:3-php8.1-node18
15+
container: quay.io/hypernode/deploy:4-php8.3-node20
1616
steps:
1717
- uses: actions/checkout@v3
1818
with:
@@ -47,7 +47,7 @@ jobs:
4747
name: acceptance
4848
url: ${{ steps.get_brancher_hostname.outputs.BRANCHER_URL }}
4949
if: github.ref != 'refs/heads/master'
50-
container: quay.io/hypernode/deploy:3-php8.1-node18
50+
container: quay.io/hypernode/deploy:4-php8.3-node20
5151
steps:
5252
- uses: actions/checkout@v3
5353
with:
@@ -102,7 +102,7 @@ jobs:
102102
name: production
103103
url: https://docs.hypernode.io
104104
if: github.ref == 'refs/heads/master'
105-
container: quay.io/hypernode/deploy:3-php8.1-node18
105+
container: quay.io/hypernode/deploy:4-php8.3-node20
106106
steps:
107107
- uses: actions/checkout@v3
108108
- name: download build artifact

.github/workflows/detect_renamed_docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
echo "$result" >> $GITHUB_OUTPUT
2121
echo "EOF" >> $GITHUB_OUTPUT
2222
shell: bash
23-
- name: Comment hostname on PR
23+
- name: Comment changed files on PR
2424
if: ${{ steps.changed_files.outputs.CHANGED_FILES }}
2525
uses: thollander/actions-comment-pull-request@v1
2626
with:

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
python-version: ['3.7', '3.8', '3.9', '3.10']
11+
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
1212

1313
steps:
1414
- uses: actions/checkout@v3

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ open localhost and now you can make changes in style and refresh the page withou
4242

4343
when you're working on scss to compile it automatically run
4444
```
45-
sass --watch docs/_static/scss:docs/_static/css
45+
npx sass --watch docs/_static/scss:docs/_static/css
4646
```
4747

48-
or after changes compile scss once:
48+
or as a production build:
4949
```
50-
sass docs/_static/scss:docs/_static/css
50+
npx sass --style compressed --no-source-map docs/_static/scss:docs/_static/css
5151
```
5252

5353
## Deployment

deploy.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@
4747
run('ln -sf docs/_build/html pub');
4848
});
4949

50+
task('node:build:scss', static function() {
51+
run('npx sass --style compressed --no-source-map docs/_static/scss:docs/_static/css');
52+
});
53+
5054
# HMV configuration for when this is running in a docker
5155
task('deploy:hmv_docker', static function () use (&$DOCKER_HOST, &$DOCKER_WEBROOT) {
5256
if (test('[ -f /etc/hypernode/is_docker ]')) {
@@ -71,6 +75,7 @@
7175
});
7276

7377
$configuration = new Configuration();
78+
$configuration->addBuildTask('node:build:scss');
7479
$configuration->addBuildTask('python:venv:create');
7580
$configuration->addBuildTask('python:venv:requirements');
7681
$configuration->addBuildTask('python:build_documentation');

docs/_static/css/breakpoints.css

Lines changed: 0 additions & 3 deletions
This file was deleted.

docs/_static/css/colors.css

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)