Skip to content

Commit

Permalink
Merge pull request #89 from lord-vesel/wf-update
Browse files Browse the repository at this point in the history 
Wf update
  • Loading branch information
@lord-vesel
lord-vesel authored Nov 11, 2024
2 parents aca590e + 27f8674 commit 5643a91
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 33 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/local-dev.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ on:
jobs:
build:
env:
DEPLOY_USER: gh-dcs-deploy
DEPLOY_HOST: lordvesel.win
RELEASE_DIR: /var/www/dcs-docs/dev/releases/${{ github.ref }}/${{ github.run_number }}
RELEASES_DIR: /var/www/dcs-docs/dev/releases/
CURRENT_DIR: /var/www/dcs-docs/dev/current
Expand All @@ -26,7 +24,7 @@ jobs:

- name: Build mkdocs
run: |
docker run -e DOCSPATH=dev-docs -i --rm -v $PWD:/build -w /build python:3.10-alpine sh -c 'apk add git gcc linux-headers musl-dev && \
podman run -e DOCSPATH=dev-docs -i --rm -v $PWD:/build -w /build python:3.10-alpine sh -c 'apk add git gcc linux-headers musl-dev && \
git config --global --add safe.directory /build && \
cd ru && pip install -r requirements.txt && \
mkdocs build && \
Expand All @@ -52,8 +50,8 @@ jobs:
if: ${{ success() }}
run: |
ntfy -b telegram send "⚡ DCS DOCS: Successfuly deployed DEV branch ${{ github.ref }}.
https://dcs-docs-dev.lordvesel.win/ru/
https://dcs-docs-dev.lordvesel.win/en/"
https://dcs-docs-dev.man-sim.org/ru/
https://dcs-docs-dev.man-sim.org/en/"
- name: Status Fail Notification
if: ${{ failure() }}
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/local-prod.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ on:
jobs:
build:
env:
DEPLOY_USER: gh-dcs-deploy
DEPLOY_HOST: lordvesel.win
RELEASE_DIR: /var/www/dcs-docs/prod/releases/${{ github.ref }}/${{ github.run_number }}
RELEASES_DIR: /var/www/dcs-docs/prod/releases/
CURRENT_DIR: /var/www/dcs-docs/prod/current
Expand All @@ -35,7 +33,7 @@ jobs:
- name: Build mkdocs
run: |
docker run -i --rm -e CI -e COMMITERS_TOKEN=${{secrets.COMMITERS_TOKEN}} -e GOOGLE_ANAL=${{secrets.GOOGLE_ANAL}} -v $PWD:/build -w /build python:3.10-alpine sh -c 'apk add git gcc linux-headers musl-dev && \
podman run -i --rm -e CI -e COMMITERS_TOKEN=${{secrets.COMMITERS_TOKEN}} -e GOOGLE_ANAL=${{secrets.GOOGLE_ANAL}} -v $PWD:/build -w /build python:3.10-alpine sh -c 'apk add git gcc linux-headers musl-dev && \
git config --global --add safe.directory /build && \
cd ru && pip install -r requirements.txt && \
mkdocs build && \
Expand All @@ -61,8 +59,8 @@ jobs:
run: |
ntfy -b telegram send "⚡ GITHUB: Successfuly deployed PROD. Check out
https://dcs-docs.lordvesel.win/ru/
https://dcs-docs.lordvesel.win/en/"
https://dcs.man-sim.org/ru/
https://dcs.man-sim.org/en/"
- name: Status Fail Notification
if: ${{ failure() }}
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/local-stage.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ on:
jobs:
build:
env:
DEPLOY_USER: gh-dcs-deploy
DEPLOY_HOST: lordvesel.win
RELEASE_DIR: /var/www/dcs-docs/stage/releases/${{ github.run_number }}
RELEASES_DIR: /var/www/dcs-docs/stage/releases/
CURRENT_DIR: /var/www/dcs-docs/stage/current
Expand Down Expand Up @@ -37,7 +35,7 @@ jobs:
- name: Build mkdocs
run: |
docker run -i --rm -v $PWD:/build -w /build python:3.11-alpine sh -c 'apk add \
podman run -i --rm -v $PWD:/build -w /build python:3.11-alpine sh -c 'apk add \
git gcc linux-headers musl-dev && \
git config --global --add safe.directory /build && \
cd ru && pip install -r requirements.txt && \
Expand All @@ -64,8 +62,8 @@ jobs:
run: |
ntfy -b telegram send "⚡ DCS DOCS: Successfuly deployed STAGE ${{env.PRURL}}
https://dcs-docs-stage.lordvesel.win/ru/
https://dcs-docs-stage.lordvesel.win/en/"
https://dcs-docs-stage.man-sim.org/ru/
https://dcs-docs-stage.man-sim.org/en/"
- name: Status Fail Notification
if: ${{ failure() }}
Expand Down
2 changes: 1 addition & 1 deletion en/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ To build the site and run web-server:

The site will be available on http://127.0.0.1:8000/

Workflow is described here https://dcs-docs.lordvesel.win/en/help/
Workflow is described here https://dcs-docs.man-sim.org/en/help/
Binary file added en/docs/img/og.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 9 additions & 9 deletions en/overrides/main.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
{% set title = title ~ " - " ~ page.title %}
{% endif %}
<!-- Facebook Meta Tags -->
<meta property="og:url" content="https://dcs-docs.lordvesel.win/ru/">
<meta property="og:url" content="https://dcs.man-sim.org/en/">
<meta property="og:type" content="website">
<meta property="og:title" content="Официальная документация DCS в гибком формате">
<meta property="og:description" content="undefined">
<meta property="og:image" content="https://dcs-docs.lordvesel.win/ru/img/og.png">
<meta property="og:title" content="DCS Web Manuals">
<!--<meta property="og:description" content="undefined">-->
<meta property="og:image" content="https://dcs.man-sim.org/en/img/og.png">

<!-- Twitter Meta Tags -->
<meta name="twitter:card" content="summary_large_image">
<meta property="twitter:domain" content="dcs-docs.lordvesel.win">
<meta property="twitter:url" content="https://dcs-docs.lordvesel.win/ru/">
<meta name="twitter:title" content="Официальная документация DCS в гибком формате">
<meta name="twitter:description" content="undefined">
<meta name="twitter:image" content="https://dcs-docs.lordvesel.win/ru/img/og.png">
<meta property="twitter:domain" content="dcs.man-sim.org">
<meta property="twitter:url" content="https://dcs.man-sim.org/en/">
<meta name="twitter:title" content="DCS Web Manuals">
<!--<meta name="twitter:description" content="undefined">-->
<meta name="twitter:image" content="https://dcs.man-sim.org/en/img/og.png">
{% endblock %}
2 changes: 1 addition & 1 deletion ru/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@

Сайт будет доступен по http://127.0.0.1:8000/

Процесс работы над проектом описан в https://dcs-docs.lordvesel.win/ru/help/
Процесс работы над проектом описан в https://dcs.man-sim.org/ru/help/
14 changes: 7 additions & 7 deletions ru/overrides/main.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
{% set title = title ~ " - " ~ page.title %}
{% endif %}
<!-- Facebook Meta Tags -->
<meta property="og:url" content="https://dcs-docs.lordvesel.win/ru/">
<meta property="og:url" content="https://dcs.man-sim.org/ru/">
<meta property="og:type" content="website">
<meta property="og:title" content="Официальная документация DCS в гибком формате">
<meta property="og:description" content="undefined">
<meta property="og:image" content="https://dcs-docs.lordvesel.win/ru/img/og.png">
<!--<meta property="og:description" content="undefined">-->
<meta property="og:image" content="https://dcs.man-sim.org/ru/img/og.png">

<!-- Twitter Meta Tags -->
<meta name="twitter:card" content="summary_large_image">
<meta property="twitter:domain" content="dcs-docs.lordvesel.win">
<meta property="twitter:url" content="https://dcs-docs.lordvesel.win/ru/">
<meta property="twitter:domain" content="dcs.man-sim.org">
<meta property="twitter:url" content="https://dcs.man-sim.org/ru/">
<meta name="twitter:title" content="Официальная документация DCS в гибком формате">
<meta name="twitter:description" content="undefined">
<meta name="twitter:image" content="https://dcs-docs.lordvesel.win/ru/img/og.png">
<!--<meta name="twitter:description" content="undefined">-->
<meta name="twitter:image" content="https://dcs.man-sim.org/ru/img/og.png">
{% endblock %}

0 comments on commit 5643a91

Please sign in to comment.