Merge pull request #731 from Loup-Garou911XD/main

documentation deployment fix and workflow improvements
This commit is contained in:
Eric Froemling 2024-09-27 16:25:28 -07:00 committed by GitHub
commit 95c79f614f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 9 deletions

View File

@ -3,7 +3,7 @@ name: Deploy Documentation
on:
push:
branches:
- master
- main
jobs:
build:
@ -46,4 +46,4 @@ jobs:
id: deployment
uses: actions/deploy-pages@v4
with:
artifact_name: sphinx_html_docs
artifact_name: sphinx_html_docs

View File

@ -222,13 +222,13 @@ jobs:
run: |
make docker-gui-release
make docker-save
- name: Rename the build
run: mv build/docker/bombsquad_gui_release_docker.tar build/docker/bombsquad_docker_gui.tar
- name: Zip the build
run: zip build/docker/bombsquad_docker_gui.tar.zip build/docker/bombsquad_gui_release_docker.tar
- name: Upload the build
uses: ncipollo/release-action@v1
with:
allowUpdates: true
artifacts: build/docker/bombsquad_docker_gui.tar
artifacts: build/docker/bombsquad_docker_gui.tar.zip
release_docker_server_image:
runs-on: ubuntu-latest
@ -244,13 +244,13 @@ jobs:
run: |
make docker-server-release
make docker-save
- name: Rename the build
run: mv build/docker/bombsquad_server_release_docker.tar build/docker/bombsquad_docker_server.tar
- name: Zip the build
run: zip build/docker/bombsquad_docker_server.tar.zip build/docker/bombsquad_server_release_docker.tar
- name: Upload the build
uses: ncipollo/release-action@v1
with:
allowUpdates: true
artifacts: build/docker/bombsquad_docker_server.tar
artifacts: build/docker/bombsquad_docker_server.tar.zip
release_sphinx_docs:
runs-on: ubuntu-latest

View File

@ -267,7 +267,7 @@ def _run_sphinx(
'copyright': copyright_text,
'version': version,
'buildnum': buildnum,
'ballistica_logo': 'https://camo.githubusercontent.com/25021344ceaa7def6fa6523f79115f7ffada8d26b4768bb9a0cf65fc33304f45/68747470733a2f2f66696c65732e62616c6c6973746963612e6e65742f62616c6c6973746963615f6d656469612f62616c6c6973746963615f6c6f676f5f68616c662e706e67', # pylint: disable=line-too-long
'ballistica_logo': 'https://files.ballistica.net/ballistica_media/ballistica_logo_half.png', # pylint: disable=line-too-long
}
)