diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml index b3d9aa43..8c0e759e 100644 --- a/.github/workflows/deploy_docs.yml +++ b/.github/workflows/deploy_docs.yml @@ -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 \ No newline at end of file + artifact_name: sphinx_html_docs diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 356a19f6..72ddc967 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/tools/batools/docs.py b/tools/batools/docs.py index 6bda55a9..05d80034 100755 --- a/tools/batools/docs.py +++ b/tools/batools/docs.py @@ -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 } )