From 70fb2b058f3ae6c3f6167731016c9bc0dbae43e4 Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 22:01:33 +0330 Subject: [PATCH] more work on release.yaml --- .woodpecker/ci.yaml | 3 -- .woodpecker/release.yaml | 51 +++++++++++++------ .woodpecker/wip/ci_build_and_test_linux.yaml | 14 ----- .woodpecker/wip/ci_check_linux.yaml | 13 ----- .../wip/ci_feature_set_copy_test_linux.yaml | 16 ------ .woodpecker/wip/ci_spinoff_test_linux.yaml | 14 ----- config/spinoffconfig.py | 4 -- 7 files changed, 35 insertions(+), 80 deletions(-) delete mode 100644 .woodpecker/wip/ci_build_and_test_linux.yaml delete mode 100644 .woodpecker/wip/ci_check_linux.yaml delete mode 100644 .woodpecker/wip/ci_feature_set_copy_test_linux.yaml delete mode 100644 .woodpecker/wip/ci_spinoff_test_linux.yaml diff --git a/.woodpecker/ci.yaml b/.woodpecker/ci.yaml index c1130b1b..f1dac411 100644 --- a/.woodpecker/ci.yaml +++ b/.woodpecker/ci.yaml @@ -10,9 +10,6 @@ steps: pull: true commands: - make env - - make assets - - make resources - - make meta - cd .. - cp -r -v $CI_REPO_NAME check_linux - cp -r -v $CI_REPO_NAME build_and_test_linux diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index aee418a5..18ecdc1c 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -3,10 +3,21 @@ when: ref: refs/tags/v* steps: - - name: build-general + - name: parallel-prepare image: codeberg.org/3ra/ballistica-dev:latest pull: true commands: + - make env + - cd .. + - cp -r -v $CI_REPO_NAME build_prefabs + - cp -r -v $CI_REPO_NAME build_gui_docker + - cp -r -v $CI_REPO_NAME build_server_docker + - cp -r -v $CI_REPO_NAME build_sphinx_docs + - cd $CI_REPO_NAME + - name: build-prefabs + image: codeberg.org/3ra/ballistica-dev:latest + commands: + - cd ../build_prefabs - make prefab-linux-arm64-gui-debug-build - make prefab-linux-x86-64-gui-debug-build - make prefab-mac-arm64-gui-debug-build @@ -15,7 +26,6 @@ steps: - make prefab-linux-x86-64-server-debug-build - make prefab-mac-arm64-server-debug-build - make prefab-windows-x86-server-debug-build - - 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 @@ -36,19 +46,19 @@ steps: - cd build/prefab/full/windows_x86_server - zip -rv ../../../../ballisticakit_windows_server.zip ballisticakit_windows_server - cd ../../../.. - - mv -v build/sphinx build/ballisticakit_sphinx_docs - - tar -cvfC ballisticakit_sphinx_docs.tar build/ ballisticakit_sphinx_docs + depends_on: [parallel-prepare] - name: build-gui-docker image: woodpeckerci/plugin-docker-buildx settings: dry-run: true - dockerfile: config/docker/Dockerfile + dockerfile: ../build_gui_docker/config/docker/Dockerfile build_args: - cmake_build_type=Debug - headless_build=1 platforms: - linux/amd64 output: type=docker,dest=ballisticakit_docker.tar + depends_on: [parallel-prepare] - name: build-server-docker image: woodpeckerci/plugin-docker-buildx settings: @@ -60,22 +70,31 @@ steps: platforms: - linux/amd64 output: type=docker,dest=ballisticakit_server_docker.tar + depends_on: [parallel-prepare] + - name: build-sphinx-docs + image: codeberg.org/3ra/ballistica-dev:latest + commands: + - make docs-sphinx + - mv -v build/sphinx build/ballisticakit_sphinx_docs + - tar -cvfC ballisticakit_sphinx_docs.tar build/ ballisticakit_sphinx_docs + depends_on: [parallel-prepare] - name: publish image: woodpeckerci/plugin-release settings: api_key: from_secret: ACCESS_TOKEN files: - - 'ballisticakit_linux_arm64.tar.gz' - - 'ballisticakit_linux_x86_64.tar.gz' - - 'ballisticakit_mac.tar.gz' - - 'ballisticakit_windows.zip' - - 'ballisticakit_linux_arm64_server.tar.gz' - - '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' + - '../build_prefabs/ballisticakit_linux_arm64.tar.gz' + - '../build_prefabs/ballisticakit_linux_x86_64.tar.gz' + - '../build_prefabs/ballisticakit_mac.tar.gz' + - '../build_prefabs/ballisticakit_windows.zip' + - '../build_prefabs/ballisticakit_linux_arm64_server.tar.gz' + - '../build_prefabs/ballisticakit_linux_x86_64_server.tar.gz' + - '../build_prefabs/ballisticakit_mac_server.tar.gz' + - '../build_prefabs/ballisticakit_windows_server.zip' + - '../build_gui_docker/ballisticakit_docker.tar' + - '../build_server_docker/ballisticakit_server_docker.tar' + - '../build_sphinx_docs/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} + depends_on: [build-prefabs, build-gui-docker, build-server-docker, build-sphinx-docs] diff --git a/.woodpecker/wip/ci_build_and_test_linux.yaml b/.woodpecker/wip/ci_build_and_test_linux.yaml deleted file mode 100644 index f912afd5..00000000 --- a/.woodpecker/wip/ci_build_and_test_linux.yaml +++ /dev/null @@ -1,14 +0,0 @@ -when: - - event: push - - event: pull_request - - event: cron - cron: ci - -steps: - - name: build_and_test - image: codeberg.org/3ra/ballistica-dev:latest - pull: true - commands: - - make env - - make cmake-server-build - - BA_PCOMMANDBATCH_BUILD_REQUIRE=1 BA_APP_RUN_ENABLE_BUILDS=1 BA_APP_RUN_BUILD_HEADLESS=1 make test diff --git a/.woodpecker/wip/ci_check_linux.yaml b/.woodpecker/wip/ci_check_linux.yaml deleted file mode 100644 index 801b362c..00000000 --- a/.woodpecker/wip/ci_check_linux.yaml +++ /dev/null @@ -1,13 +0,0 @@ -when: - - event: push - - event: pull_request - - event: cron - cron: ci - -steps: - - name: check - image: codeberg.org/3ra/ballistica-dev:latest - pull: true - commands: - - make env - - BA_PCOMMANDBATCH_BUILD_REQUIRE=1 make check diff --git a/.woodpecker/wip/ci_feature_set_copy_test_linux.yaml b/.woodpecker/wip/ci_feature_set_copy_test_linux.yaml deleted file mode 100644 index ec0e5fc7..00000000 --- a/.woodpecker/wip/ci_feature_set_copy_test_linux.yaml +++ /dev/null @@ -1,16 +0,0 @@ -when: - - event: push - - event: pull_request - - event: cron - cron: ci - -steps: - - name: test - image: codeberg.org/3ra/ballistica-dev:latest - pull: true - commands: - - make env - - tools/spinoff fset-copy template_fs poo - - make update - - make cmake-modular-server-build - - cd build/cmake/modular-server-debug/staged/dist && PYTHONPATH=ba_data/python ./ballisticakit_headless -c "import baenv; baenv.configure(); import bapoo; print(bapoo)" diff --git a/.woodpecker/wip/ci_spinoff_test_linux.yaml b/.woodpecker/wip/ci_spinoff_test_linux.yaml deleted file mode 100644 index c9452596..00000000 --- a/.woodpecker/wip/ci_spinoff_test_linux.yaml +++ /dev/null @@ -1,14 +0,0 @@ -when: - - event: push - - event: pull_request - - event: cron - cron: ci - -steps: - - name: test - image: codeberg.org/3ra/ballistica-dev:latest - pull: true - commands: - - make env - - make spinoff-test-core - - make spinoff-test-base diff --git a/config/spinoffconfig.py b/config/spinoffconfig.py index d7f7ea75..ea8a0e21 100644 --- a/config/spinoffconfig.py +++ b/config/spinoffconfig.py @@ -201,10 +201,6 @@ ctx.filter_file_names = { 'ballistica_dev_dockerfile', 'ballistica_dev_image.yaml', 'ci.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',