Skip to content

Commit

Permalink
Merge branch 'master' into documentation-horizontal-autoscaling
Browse files Browse the repository at this point in the history
  • Loading branch information
hrithikkothari1234 authored Jan 2, 2025
2 parents 4c7cdcf + 53f6806 commit 64582a5
Show file tree
Hide file tree
Showing 20 changed files with 235 additions and 1,979 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cleanup_acceptance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
cleanup:
runs-on: ubuntu-latest
container: quay.io/hypernode/deploy:3-php8.1-node18
container: quay.io/hypernode/deploy:4-php8.3-node20
environment: acceptance
steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest
container: quay.io/hypernode/deploy:3-php8.1-node18
container: quay.io/hypernode/deploy:4-php8.3-node20
steps:
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
name: acceptance
url: ${{ steps.get_brancher_hostname.outputs.BRANCHER_URL }}
if: github.ref != 'refs/heads/master'
container: quay.io/hypernode/deploy:3-php8.1-node18
container: quay.io/hypernode/deploy:4-php8.3-node20
steps:
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
name: production
url: https://docs.hypernode.io
if: github.ref == 'refs/heads/master'
container: quay.io/hypernode/deploy:3-php8.1-node18
container: quay.io/hypernode/deploy:4-php8.3-node20
steps:
- uses: actions/checkout@v3
- name: download build artifact
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/detect_renamed_docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
echo "$result" >> $GITHUB_OUTPUT
echo "EOF" >> $GITHUB_OUTPUT
shell: bash
- name: Comment hostname on PR
- name: Comment changed files on PR
if: ${{ steps.changed_files.outputs.CHANGED_FILES }}
uses: thollander/actions-comment-pull-request@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10']
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']

steps:
- uses: actions/checkout@v3
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ open localhost and now you can make changes in style and refresh the page withou

when you're working on scss to compile it automatically run
```
sass --watch docs/_static/scss:docs/_static/css
npx sass --watch docs/_static/scss:docs/_static/css
```

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

## Deployment
Expand Down
5 changes: 5 additions & 0 deletions deploy.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
run('ln -sf docs/_build/html pub');
});

task('node:build:scss', static function() {
run('npx sass --style compressed --no-source-map docs/_static/scss:docs/_static/css');
});

# HMV configuration for when this is running in a docker
task('deploy:hmv_docker', static function () use (&$DOCKER_HOST, &$DOCKER_WEBROOT) {
if (test('[ -f /etc/hypernode/is_docker ]')) {
Expand All @@ -71,6 +75,7 @@
});

$configuration = new Configuration();
$configuration->addBuildTask('node:build:scss');
$configuration->addBuildTask('python:venv:create');
$configuration->addBuildTask('python:venv:requirements');
$configuration->addBuildTask('python:build_documentation');
Expand Down
3 changes: 0 additions & 3 deletions docs/_static/css/breakpoints.css

This file was deleted.

31 changes: 0 additions & 31 deletions docs/_static/css/colors.css

This file was deleted.

Loading

0 comments on commit 64582a5

Please sign in to comment.