From af0abb228ae7ad015d89594211cc55681be1f8b9 Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 16:35:10 +0330 Subject: [PATCH] one more --- .../{Dockerfile => ballistica_dev_dockerfile} | 0 .woodpecker/ballistica_dev_image.yaml | 4 ++-- ...d_test.yaml => ci_build_and_test_linux.yaml} | 2 +- .woodpecker/ci_build_and_test_windows.yaml | 17 +++++++++++++++++ .../{ci_check.yaml => ci_check_linux.yaml} | 2 +- ...yaml => ci_feature_set_copy_test_linux.yaml} | 2 +- ...off_test.yaml => ci_spinoff_test_linux.yaml} | 2 +- .woodpecker/release.yaml | 16 ++++++++++++++-- config/spinoffconfig.py | 9 +++++++++ 9 files changed, 46 insertions(+), 8 deletions(-) rename .woodpecker/{Dockerfile => ballistica_dev_dockerfile} (100%) rename .woodpecker/{ci_build_and_test.yaml => ci_build_and_test_linux.yaml} (92%) create mode 100644 .woodpecker/ci_build_and_test_windows.yaml rename .woodpecker/{ci_check.yaml => ci_check_linux.yaml} (93%) rename .woodpecker/{ci_feature_set_copy_test.yaml => ci_feature_set_copy_test_linux.yaml} (96%) rename .woodpecker/{ci_spinoff_test.yaml => ci_spinoff_test_linux.yaml} (93%) diff --git a/.woodpecker/Dockerfile b/.woodpecker/ballistica_dev_dockerfile similarity index 100% rename from .woodpecker/Dockerfile rename to .woodpecker/ballistica_dev_dockerfile diff --git a/.woodpecker/ballistica_dev_image.yaml b/.woodpecker/ballistica_dev_image.yaml index 155e96b1..4858b765 100644 --- a/.woodpecker/ballistica_dev_image.yaml +++ b/.woodpecker/ballistica_dev_image.yaml @@ -2,10 +2,10 @@ when: - event: manual steps: - - name: build_and_publish + - name: build-and-publish image: woodpeckerci/plugin-kaniko settings: - dockerfile: .woodpecker/Dockerfile + dockerfile: .woodpecker/ballistica_dev_dockerfile registry: codeberg.org repo: ${CI_REPO}-dev tag: latest diff --git a/.woodpecker/ci_build_and_test.yaml b/.woodpecker/ci_build_and_test_linux.yaml similarity index 92% rename from .woodpecker/ci_build_and_test.yaml rename to .woodpecker/ci_build_and_test_linux.yaml index 82a4d68c..f912afd5 100644 --- a/.woodpecker/ci_build_and_test.yaml +++ b/.woodpecker/ci_build_and_test_linux.yaml @@ -5,7 +5,7 @@ when: cron: ci steps: - - name: linux + - name: build_and_test image: codeberg.org/3ra/ballistica-dev:latest pull: true commands: diff --git a/.woodpecker/ci_build_and_test_windows.yaml b/.woodpecker/ci_build_and_test_windows.yaml new file mode 100644 index 00000000..cfd40ec9 --- /dev/null +++ b/.woodpecker/ci_build_and_test_windows.yaml @@ -0,0 +1,17 @@ +when: + - event: push + - event: pull_request + - event: cron + cron: ci + +steps: + - name: build-and-test + image: python:3.12-windowsservercore + commands: + - $env:PYTHONPATH = "tools" + - python -m efrotools.genwrapper pcommand batools.pcommandmain tools/pcommand + - python -m pip install --upgrade pip + - pip install pytest typing_extensions + - python tools/pcommand win_ci_install_prereqs + - python tools/pcommand win_ci_binary_build + - python tools/pcommand pytest -v tests diff --git a/.woodpecker/ci_check.yaml b/.woodpecker/ci_check_linux.yaml similarity index 93% rename from .woodpecker/ci_check.yaml rename to .woodpecker/ci_check_linux.yaml index 60606f4f..801b362c 100644 --- a/.woodpecker/ci_check.yaml +++ b/.woodpecker/ci_check_linux.yaml @@ -5,7 +5,7 @@ when: cron: ci steps: - - name: linux + - name: check image: codeberg.org/3ra/ballistica-dev:latest pull: true commands: diff --git a/.woodpecker/ci_feature_set_copy_test.yaml b/.woodpecker/ci_feature_set_copy_test_linux.yaml similarity index 96% rename from .woodpecker/ci_feature_set_copy_test.yaml rename to .woodpecker/ci_feature_set_copy_test_linux.yaml index 61ea7fdd..ec0e5fc7 100644 --- a/.woodpecker/ci_feature_set_copy_test.yaml +++ b/.woodpecker/ci_feature_set_copy_test_linux.yaml @@ -5,7 +5,7 @@ when: cron: ci steps: - - name: linux + - name: test image: codeberg.org/3ra/ballistica-dev:latest pull: true commands: diff --git a/.woodpecker/ci_spinoff_test.yaml b/.woodpecker/ci_spinoff_test_linux.yaml similarity index 93% rename from .woodpecker/ci_spinoff_test.yaml rename to .woodpecker/ci_spinoff_test_linux.yaml index 35e7be33..c9452596 100644 --- a/.woodpecker/ci_spinoff_test.yaml +++ b/.woodpecker/ci_spinoff_test_linux.yaml @@ -5,7 +5,7 @@ when: cron: ci steps: - - name: linux + - name: test image: codeberg.org/3ra/ballistica-dev:latest pull: true commands: diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 41bbdefa..c990b80d 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -15,6 +15,11 @@ steps: - make prefab-linux-x86-64-server-debug-build - make prefab-mac-arm64-server-debug-build - make prefab-windows-x86-server-debug-build + - make docker-gui-release + - make docker-save + - make docker-server-release + - make docker-save + - make docs-sphinx - mv -v build/prefab/full/linux_arm64_gui/debug build/prefab/full/linux_arm64_gui/ballisticakit_linux_arm64 - tar cvzfC ballisticakit_linux_arm64.tar.gz build/prefab/full/linux_arm64_gui ballisticakit_linux_arm64 - mv -v build/prefab/full/linux_x86_64_gui/debug build/prefab/full/linux_x86_64_gui/ballisticakit_linux_x86_64 @@ -23,7 +28,7 @@ steps: - tar cvzfC ballisticakit_mac.tar.gz build/prefab/full/mac_arm64_gui ballisticakit_mac - mv -v build/prefab/full/windows_x86_gui/debug build/prefab/full/windows_x86_gui/ballisticakit_windows - cd build/prefab/full/windows_x86_gui - - zip -r ../../../../ballisticakit_windows.zip ballisticakit_windows + - zip -rv ../../../../ballisticakit_windows.zip ballisticakit_windows - cd ../../../.. - mv -v build/prefab/full/linux_arm64_server/debug build/prefab/full/linux_arm64_server/ballisticakit_linux_arm64_server - tar cvzfC ballisticakit_linux_arm64_server.tar.gz build/prefab/full/linux_arm64_server ballisticakit_linux_arm64_server @@ -33,8 +38,12 @@ steps: - tar cvzfC ballisticakit_mac_server.tar.gz build/prefab/full/mac_arm64_server ballisticakit_mac_server - mv -v build/prefab/full/windows_x86_server/debug build/prefab/full/windows_x86_server/ballisticakit_windows_server - cd build/prefab/full/windows_x86_server - - zip -r ../../../../ballisticakit_windows_server.zip ballisticakit_windows_server + - zip -rv ../../../../ballisticakit_windows_server.zip ballisticakit_windows_server - cd ../../../.. + - mv -v build/docker/bombsquad_gui_release_docker.tar ballisticakit_docker.tar + - mv -v build/docker/bombsquad_server_release_docker.tar ballisticakit_server_docker.tar + - mv -v build/sphinx build/ballisticakit_sphinx + - tar -cvfC ballisticakit_sphinx_docs.tar build ballisticakit_sphinx - name: publish image: woodpeckerci/plugin-release settings: @@ -49,5 +58,8 @@ steps: - 'ballisticakit_linux_x86_64_server.tar.gz' - 'ballisticakit_mac_server.tar.gz' - 'ballisticakit_windows_server.zip' + - 'ballisticakit_docker.tar' + - 'ballisticakit_server_docker.tar' + - 'ballisticakit_sphinx_docs.tar' note: 'These are debug prefab builds; use them for testing purposes only. Check out https://ballistica.net/downloads for official/blessed release builds' title: ${CI_COMMIT_TAG} diff --git a/config/spinoffconfig.py b/config/spinoffconfig.py index 51da5f16..ea563207 100644 --- a/config/spinoffconfig.py +++ b/config/spinoffconfig.py @@ -198,6 +198,15 @@ ctx.filter_file_names = { 'deploy_docs.yml', 'nightly.yml', 'release.yml', + 'ballistica_dev_dockerfile', + 'ballistica_dev_image.yaml', + 'ci_check_linux.yaml', + 'ci_build_and_test_linux.yaml', + 'ci_spinoff_test_linux.yaml' + 'ci_feature_set_copy_test_linux.yaml', + 'ci_build_and_test_windows.yaml', + 'deploy_docs.yaml' + 'release.yaml' 'LICENSE', 'cloudtool', 'bacloud',