From bdda4696a49f8ca6e00f36652ab208f8ad93eddd Mon Sep 17 00:00:00 2001 From: era <3ra@noreply.codeberg.org> Date: Fri, 17 Jan 2025 10:35:10 +0330 Subject: [PATCH 01/40] woodpeck 1 --- .woodpecker/cd.yaml | 22 ++++++++++++++++++++++ .woodpecker/trigger.yaml | 18 ++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 .woodpecker/cd.yaml create mode 100644 .woodpecker/trigger.yaml diff --git a/.woodpecker/cd.yaml b/.woodpecker/cd.yaml new file mode 100644 index 00000000..88d22689 --- /dev/null +++ b/.woodpecker/cd.yaml @@ -0,0 +1,22 @@ +when: + - event: tag + +steps: + - name: build + image: 3ra0/ballistica:dev + pull: true + commands: + - make prefab-linux-x86-64-gui-debug-build + - mv -v build/prefab/full/linux_x86_64_gui/debug build/prefab/full/linux_x86_64_gui/ballisticakit_linux_x86_64_debug + - tar cvzfC ballisticakit_linux_x86_64_debug.tar.xz build/prefab/full/linux_x86_64_gui ballisticakit_linux_x86_64_debug + - name: publish + image: woodpeckerci/plugin-release + settings: + api_key: + from_secret: ACCESS_TOKEN + files: + - 'ballisticakit_linux_x86_64.tar.xz' + prerelease: true + note: 'These are automated debug prefab builds; use them for testing purposes only.' + title: 'auto pre-release' + depends_on: [build] diff --git a/.woodpecker/trigger.yaml b/.woodpecker/trigger.yaml new file mode 100644 index 00000000..8d77112f --- /dev/null +++ b/.woodpecker/trigger.yaml @@ -0,0 +1,18 @@ +when: + - event: push + +skip_clone: true + +steps: + - name: tag + image: alpine/curl + environment: + ACCESS_TOKEN: + from_secret: ACCESS_TOKEN + commands: + - >- + curl -s -o /dev/null -X "DELETE" "https://codeberg.org/api/v1/repos/$CI_REPO/releases/tags/auto.latest" -H "accept: application/json" -H "Authorization: token $ACCESS_TOKEN" + - >- + curl -s -o /dev/null -X "DELETE" "https://codeberg.org/api/v1/repos/$CI_REPO/tags/auto.latest" -H "accept: application/json" -H "Authorization: token $ACCESS_TOKEN" + - >- + if [ $(curl -s -o /dev/null -w "%{http_code}" -X "POST" "https://codeberg.org/api/v1/repos/$CI_REPO/tags" -H "accept: application/json" -H "Authorization: token $ACCESS_TOKEN" -H "Content-Type: application/json" -d "{\"message\": \"AUTO TRIGGER TAG\", \"tag_name\": \"auto.latest\", \"target\": \"$CI_COMMIT_SHA\"}") != "201" ]; then exit 1; fi From 9750c70192b84d1a39b836377ff9fa6c8e97f700 Mon Sep 17 00:00:00 2001 From: era Date: Sat, 18 Jan 2025 21:28:51 +0330 Subject: [PATCH 02/40] more woodpecking --- .woodpecker/Dockerfile | 5 +++++ .woodpecker/ballistica_dev_image.yaml | 14 ++++++++++++++ .woodpecker/{cd.yaml => release.yaml} | 7 +++---- .woodpecker/trigger.yaml | 18 ------------------ 4 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 .woodpecker/Dockerfile create mode 100644 .woodpecker/ballistica_dev_image.yaml rename .woodpecker/{cd.yaml => release.yaml} (76%) delete mode 100644 .woodpecker/trigger.yaml diff --git a/.woodpecker/Dockerfile b/.woodpecker/Dockerfile new file mode 100644 index 00000000..cd2086d0 --- /dev/null +++ b/.woodpecker/Dockerfile @@ -0,0 +1,5 @@ +FROM python:3.12 +RUN apt update && apt -y upgrade && apt -y --no-install-recommends install libopenal-dev libsdl2-dev libvorbis-dev cmake clang-format rsync +RUN pip install --upgrade pip +COPY ../config/requirements.txt ballistica_requirements.txt +RUN pip install -r ballistica_requirements.txt diff --git a/.woodpecker/ballistica_dev_image.yaml b/.woodpecker/ballistica_dev_image.yaml new file mode 100644 index 00000000..527aebcb --- /dev/null +++ b/.woodpecker/ballistica_dev_image.yaml @@ -0,0 +1,14 @@ +when: + - event: manual + +steps: + - name: buildx + image: woodpeckerci/plugin-docker-buildx + settings: + dockerfile: .woodpecker/Dockerfile + registry: codeberg.org + repo: ${CI_REPO}-dev + tag: latest + username: ${CI_REPO_OWNER} + password: + from_secret: ACCESS_TOKEN diff --git a/.woodpecker/cd.yaml b/.woodpecker/release.yaml similarity index 76% rename from .woodpecker/cd.yaml rename to .woodpecker/release.yaml index 88d22689..47c0499a 100644 --- a/.woodpecker/cd.yaml +++ b/.woodpecker/release.yaml @@ -1,9 +1,10 @@ when: - event: tag + ref: refs/tags/v* steps: - name: build - image: 3ra0/ballistica:dev + image: codeberg.org/3ra/ballistica-dev:latest pull: true commands: - make prefab-linux-x86-64-gui-debug-build @@ -16,7 +17,5 @@ steps: from_secret: ACCESS_TOKEN files: - 'ballisticakit_linux_x86_64.tar.xz' - prerelease: true - note: 'These are automated debug prefab builds; use them for testing purposes only.' - title: 'auto pre-release' + title: ${CI_COMMIT_TAG} depends_on: [build] diff --git a/.woodpecker/trigger.yaml b/.woodpecker/trigger.yaml deleted file mode 100644 index 8d77112f..00000000 --- a/.woodpecker/trigger.yaml +++ /dev/null @@ -1,18 +0,0 @@ -when: - - event: push - -skip_clone: true - -steps: - - name: tag - image: alpine/curl - environment: - ACCESS_TOKEN: - from_secret: ACCESS_TOKEN - commands: - - >- - curl -s -o /dev/null -X "DELETE" "https://codeberg.org/api/v1/repos/$CI_REPO/releases/tags/auto.latest" -H "accept: application/json" -H "Authorization: token $ACCESS_TOKEN" - - >- - curl -s -o /dev/null -X "DELETE" "https://codeberg.org/api/v1/repos/$CI_REPO/tags/auto.latest" -H "accept: application/json" -H "Authorization: token $ACCESS_TOKEN" - - >- - if [ $(curl -s -o /dev/null -w "%{http_code}" -X "POST" "https://codeberg.org/api/v1/repos/$CI_REPO/tags" -H "accept: application/json" -H "Authorization: token $ACCESS_TOKEN" -H "Content-Type: application/json" -d "{\"message\": \"AUTO TRIGGER TAG\", \"tag_name\": \"auto.latest\", \"target\": \"$CI_COMMIT_SHA\"}") != "201" ]; then exit 1; fi From 70bf65914771b8d0d28f8a4dd5990338f1296481 Mon Sep 17 00:00:00 2001 From: era Date: Sat, 18 Jan 2025 21:39:06 +0330 Subject: [PATCH 03/40] more --- .woodpecker/ballistica_dev_image.yaml | 2 +- .woodpecker/release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/ballistica_dev_image.yaml b/.woodpecker/ballistica_dev_image.yaml index 527aebcb..a48d9773 100644 --- a/.woodpecker/ballistica_dev_image.yaml +++ b/.woodpecker/ballistica_dev_image.yaml @@ -7,7 +7,7 @@ steps: settings: dockerfile: .woodpecker/Dockerfile registry: codeberg.org - repo: ${CI_REPO}-dev + repo: ${CI_REPO} tag: latest username: ${CI_REPO_OWNER} password: diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 47c0499a..f374458a 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -4,7 +4,7 @@ when: steps: - name: build - image: codeberg.org/3ra/ballistica-dev:latest + image: codeberg.org/3ra/ballistica:latest pull: true commands: - make prefab-linux-x86-64-gui-debug-build From f5dd32438161aa3e08a3d736f579e94a54b83164 Mon Sep 17 00:00:00 2001 From: era Date: Sat, 18 Jan 2025 21:47:24 +0330 Subject: [PATCH 04/40] more --- .woodpecker/ballistica_dev_image.yaml | 2 +- .woodpecker/release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/ballistica_dev_image.yaml b/.woodpecker/ballistica_dev_image.yaml index a48d9773..527aebcb 100644 --- a/.woodpecker/ballistica_dev_image.yaml +++ b/.woodpecker/ballistica_dev_image.yaml @@ -7,7 +7,7 @@ steps: settings: dockerfile: .woodpecker/Dockerfile registry: codeberg.org - repo: ${CI_REPO} + repo: ${CI_REPO}-dev tag: latest username: ${CI_REPO_OWNER} password: diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index f374458a..47c0499a 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -4,7 +4,7 @@ when: steps: - name: build - image: codeberg.org/3ra/ballistica:latest + image: codeberg.org/3ra/ballistica-dev:latest pull: true commands: - make prefab-linux-x86-64-gui-debug-build From bc7003f6b8bec3b628d7359a9fc81d31ba3f2ca0 Mon Sep 17 00:00:00 2001 From: era Date: Sat, 18 Jan 2025 22:05:01 +0330 Subject: [PATCH 05/40] more --- .woodpecker/ballistica_dev_image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/ballistica_dev_image.yaml b/.woodpecker/ballistica_dev_image.yaml index 527aebcb..0db9e545 100644 --- a/.woodpecker/ballistica_dev_image.yaml +++ b/.woodpecker/ballistica_dev_image.yaml @@ -3,7 +3,7 @@ when: steps: - name: buildx - image: woodpeckerci/plugin-docker-buildx + image: woodpeckerci/plugin-kaniko settings: dockerfile: .woodpecker/Dockerfile registry: codeberg.org From c41402513beeb29b9ee6cb0488d2133f415d42cd Mon Sep 17 00:00:00 2001 From: era Date: Sat, 18 Jan 2025 22:14:00 +0330 Subject: [PATCH 06/40] more --- .woodpecker/Dockerfile | 2 +- .woodpecker/ballistica_dev_image.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/Dockerfile b/.woodpecker/Dockerfile index cd2086d0..6d69bf1b 100644 --- a/.woodpecker/Dockerfile +++ b/.woodpecker/Dockerfile @@ -1,5 +1,5 @@ FROM python:3.12 RUN apt update && apt -y upgrade && apt -y --no-install-recommends install libopenal-dev libsdl2-dev libvorbis-dev cmake clang-format rsync RUN pip install --upgrade pip -COPY ../config/requirements.txt ballistica_requirements.txt +COPY config/requirements.txt ballistica_requirements.txt RUN pip install -r ballistica_requirements.txt diff --git a/.woodpecker/ballistica_dev_image.yaml b/.woodpecker/ballistica_dev_image.yaml index 0db9e545..527aebcb 100644 --- a/.woodpecker/ballistica_dev_image.yaml +++ b/.woodpecker/ballistica_dev_image.yaml @@ -3,7 +3,7 @@ when: steps: - name: buildx - image: woodpeckerci/plugin-kaniko + image: woodpeckerci/plugin-docker-buildx settings: dockerfile: .woodpecker/Dockerfile registry: codeberg.org From d089804bbbb49c23b363d4ebb8bb02fed77e7d02 Mon Sep 17 00:00:00 2001 From: era Date: Sat, 18 Jan 2025 22:28:02 +0330 Subject: [PATCH 07/40] more --- .woodpecker/ballistica_dev_image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/ballistica_dev_image.yaml b/.woodpecker/ballistica_dev_image.yaml index 527aebcb..0db9e545 100644 --- a/.woodpecker/ballistica_dev_image.yaml +++ b/.woodpecker/ballistica_dev_image.yaml @@ -3,7 +3,7 @@ when: steps: - name: buildx - image: woodpeckerci/plugin-docker-buildx + image: woodpeckerci/plugin-kaniko settings: dockerfile: .woodpecker/Dockerfile registry: codeberg.org From 9ce7c8a93dd36cd934871bbcaf8699483ea85fa5 Mon Sep 17 00:00:00 2001 From: era Date: Sat, 18 Jan 2025 23:11:39 +0330 Subject: [PATCH 08/40] more --- .woodpecker/release.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 47c0499a..09b1732e 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -7,15 +7,15 @@ steps: image: codeberg.org/3ra/ballistica-dev:latest pull: true commands: - - make prefab-linux-x86-64-gui-debug-build - - mv -v build/prefab/full/linux_x86_64_gui/debug build/prefab/full/linux_x86_64_gui/ballisticakit_linux_x86_64_debug - - tar cvzfC ballisticakit_linux_x86_64_debug.tar.xz build/prefab/full/linux_x86_64_gui ballisticakit_linux_x86_64_debug + - make prefab-linux-x86-64-gui-release-build + - mv -v build/prefab/full/linux_x86_64_gui/release build/prefab/full/linux_x86_64_gui/ballisticakit_linux_x86_64 + - tar cvzfC ballisticakit_linux_x86_64.tar.gz build/prefab/full/linux_x86_64_gui ballisticakit_linux_x86_64 - name: publish image: woodpeckerci/plugin-release settings: api_key: from_secret: ACCESS_TOKEN files: - - 'ballisticakit_linux_x86_64.tar.xz' + - 'ballisticakit_linux_x86_64.tar.gz' title: ${CI_COMMIT_TAG} depends_on: [build] From e26e741000c07b7f171d7105749631cc43d6b0ec Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 08:44:24 +0330 Subject: [PATCH 09/40] more woodpecking indeed --- .woodpecker/release.yaml | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 09b1732e..b313bbfb 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -7,9 +7,32 @@ steps: image: codeberg.org/3ra/ballistica-dev:latest pull: true commands: - - make prefab-linux-x86-64-gui-release-build - - mv -v build/prefab/full/linux_x86_64_gui/release build/prefab/full/linux_x86_64_gui/ballisticakit_linux_x86_64 + - make prefab-windows-x86-gui-debug-build + - make prefab-linux-x86-64-gui-debug-build + - mv -v build/prefab/full/linux_x86_64_gui/debug build/prefab/full/linux_x86_64_gui/ballisticakit_linux_x86_64 - tar cvzfC ballisticakit_linux_x86_64.tar.gz build/prefab/full/linux_x86_64_gui ballisticakit_linux_x86_64 + - make prefab-mac-x86-64-gui-debug-build + - mv -v build/prefab/full/mac_x86_64_gui/debug build/prefab/full/mac_x86_64_gui/ballisticakit_mac_x86_64 + - tar cvzfC ballisticakit_mac_x86_64.tar.gz build/prefab/full/mac_x86_64_gui ballisticakit_mac_x86_64 + - make prefab-linux-arm64-gui-debug-build + - 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 + - make prefab-mac-arm64-gui-debug-build + - mv -v build/prefab/full/mac_arm64_gui/debug build/prefab/full/mac_arm64_gui/ballisticakit_mac_arm64 + - tar cvzfC ballisticakit_mac_arm64.tar.gz build/prefab/full/mac_arm64_gui ballisticakit_mac_arm64 + - make prefab-windows-x86-server-debug-build + - make prefab-linux-x86-64-server-debug-build + - mv -v build/prefab/full/linux_x86_64_server/debug build/prefab/full/linux_x86_64_server/ballisticakit_linux_x86_64_server + - tar cvzfC ballisticakit_linux_x86_64_server.tar.gz build/prefab/full/linux_x86_64_server ballisticakit_linux_x86_64_server + - make prefab-mac-x86-64-server-debug-build + - mv -v build/prefab/full/mac_x86_64_server/debug build/prefab/full/mac_x86_64_server/ballisticakit_mac_x86_64_server + - tar cvzfC ballisticakit_mac_x86_64_server.tar.gz build/prefab/full/mac_x86_64_server ballisticakit_mac_x86_64_server + - make prefab-linux-arm64-server-debug-build + - 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 + - make prefab-mac-arm64-server-debug-build + - mv -v build/prefab/full/mac_arm64_server/debug build/prefab/full/mac_arm64_server/ballisticakit_mac_arm64_server + - tar cvzfC ballisticakit_mac_arm64_server.tar.gz build/prefab/full/mac_arm64_server ballisticakit_mac_arm64_server - name: publish image: woodpeckerci/plugin-release settings: @@ -17,5 +40,13 @@ steps: from_secret: ACCESS_TOKEN files: - 'ballisticakit_linux_x86_64.tar.gz' + - 'ballisticakit_mac_x86_64.tar.gz' + - 'ballisticakit_linux_arm64.tar.gz' + - 'ballisticakit_mac_arm64.tar.gz' + - 'ballisticakit_linux_x86_64_server.tar.gz' + - 'ballisticakit_mac_x86_64_server.tar.gz' + - 'ballisticakit_linux_arm64_server.tar.gz' + - 'ballisticakit_mac_arm64_server.tar.gz' + 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] From 52fbb4dc774721ab13d92214ee53ca1a5eff966b Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 09:03:40 +0330 Subject: [PATCH 10/40] more woodpecking --- .woodpecker/release.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index b313bbfb..196a4260 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -9,28 +9,28 @@ steps: commands: - make prefab-windows-x86-gui-debug-build - make prefab-linux-x86-64-gui-debug-build - - mv -v build/prefab/full/linux_x86_64_gui/debug build/prefab/full/linux_x86_64_gui/ballisticakit_linux_x86_64 - - tar cvzfC ballisticakit_linux_x86_64.tar.gz build/prefab/full/linux_x86_64_gui ballisticakit_linux_x86_64 - make prefab-mac-x86-64-gui-debug-build - - mv -v build/prefab/full/mac_x86_64_gui/debug build/prefab/full/mac_x86_64_gui/ballisticakit_mac_x86_64 - - tar cvzfC ballisticakit_mac_x86_64.tar.gz build/prefab/full/mac_x86_64_gui ballisticakit_mac_x86_64 - make prefab-linux-arm64-gui-debug-build - - 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 - make prefab-mac-arm64-gui-debug-build - - mv -v build/prefab/full/mac_arm64_gui/debug build/prefab/full/mac_arm64_gui/ballisticakit_mac_arm64 - - tar cvzfC ballisticakit_mac_arm64.tar.gz build/prefab/full/mac_arm64_gui ballisticakit_mac_arm64 - make prefab-windows-x86-server-debug-build - make prefab-linux-x86-64-server-debug-build + - make prefab-mac-x86-64-server-debug-build + - make prefab-linux-arm64-server-debug-build + - make prefab-mac-arm64-server-debug-build + - mv -v build/prefab/full/linux_x86_64_gui/debug build/prefab/full/linux_x86_64_gui/ballisticakit_linux_x86_64 + - tar cvzfC ballisticakit_linux_x86_64.tar.gz build/prefab/full/linux_x86_64_gui ballisticakit_linux_x86_64 + - mv -v build/prefab/full/mac_x86_64_gui/debug build/prefab/full/mac_x86_64_gui/ballisticakit_mac_x86_64 + - tar cvzfC ballisticakit_mac_x86_64.tar.gz build/prefab/full/mac_x86_64_gui ballisticakit_mac_x86_64 + - 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/mac_arm64_gui/debug build/prefab/full/mac_arm64_gui/ballisticakit_mac_arm64 + - tar cvzfC ballisticakit_mac_arm64.tar.gz build/prefab/full/mac_arm64_gui ballisticakit_mac_arm64 - mv -v build/prefab/full/linux_x86_64_server/debug build/prefab/full/linux_x86_64_server/ballisticakit_linux_x86_64_server - tar cvzfC ballisticakit_linux_x86_64_server.tar.gz build/prefab/full/linux_x86_64_server ballisticakit_linux_x86_64_server - - make prefab-mac-x86-64-server-debug-build - mv -v build/prefab/full/mac_x86_64_server/debug build/prefab/full/mac_x86_64_server/ballisticakit_mac_x86_64_server - tar cvzfC ballisticakit_mac_x86_64_server.tar.gz build/prefab/full/mac_x86_64_server ballisticakit_mac_x86_64_server - - make prefab-linux-arm64-server-debug-build - 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 - - make prefab-mac-arm64-server-debug-build - mv -v build/prefab/full/mac_arm64_server/debug build/prefab/full/mac_arm64_server/ballisticakit_mac_arm64_server - tar cvzfC ballisticakit_mac_arm64_server.tar.gz build/prefab/full/mac_arm64_server ballisticakit_mac_arm64_server - name: publish From ec0f7e444ac0e7db35b4b32d7dded40ddbd319aa Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 11:09:52 +0330 Subject: [PATCH 11/40] more woodpecking once more --- .woodpecker/release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 196a4260..403027e8 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -7,6 +7,7 @@ steps: image: codeberg.org/3ra/ballistica-dev:latest pull: true commands: + - make assets && make meta - make prefab-windows-x86-gui-debug-build - make prefab-linux-x86-64-gui-debug-build - make prefab-mac-x86-64-gui-debug-build From eebad2e330c758da7313755a0cf6b3846e3f41d9 Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 11:37:44 +0330 Subject: [PATCH 12/40] more woodpecking twice more --- .woodpecker/release.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 403027e8..d9ac57ab 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -7,29 +7,22 @@ steps: image: codeberg.org/3ra/ballistica-dev:latest pull: true commands: - - make assets && make meta - make prefab-windows-x86-gui-debug-build - make prefab-linux-x86-64-gui-debug-build - - make prefab-mac-x86-64-gui-debug-build - make prefab-linux-arm64-gui-debug-build - make prefab-mac-arm64-gui-debug-build - make prefab-windows-x86-server-debug-build - make prefab-linux-x86-64-server-debug-build - - make prefab-mac-x86-64-server-debug-build - make prefab-linux-arm64-server-debug-build - make prefab-mac-arm64-server-debug-build - mv -v build/prefab/full/linux_x86_64_gui/debug build/prefab/full/linux_x86_64_gui/ballisticakit_linux_x86_64 - tar cvzfC ballisticakit_linux_x86_64.tar.gz build/prefab/full/linux_x86_64_gui ballisticakit_linux_x86_64 - - mv -v build/prefab/full/mac_x86_64_gui/debug build/prefab/full/mac_x86_64_gui/ballisticakit_mac_x86_64 - - tar cvzfC ballisticakit_mac_x86_64.tar.gz build/prefab/full/mac_x86_64_gui ballisticakit_mac_x86_64 - 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/mac_arm64_gui/debug build/prefab/full/mac_arm64_gui/ballisticakit_mac_arm64 - tar cvzfC ballisticakit_mac_arm64.tar.gz build/prefab/full/mac_arm64_gui ballisticakit_mac_arm64 - mv -v build/prefab/full/linux_x86_64_server/debug build/prefab/full/linux_x86_64_server/ballisticakit_linux_x86_64_server - tar cvzfC ballisticakit_linux_x86_64_server.tar.gz build/prefab/full/linux_x86_64_server ballisticakit_linux_x86_64_server - - mv -v build/prefab/full/mac_x86_64_server/debug build/prefab/full/mac_x86_64_server/ballisticakit_mac_x86_64_server - - tar cvzfC ballisticakit_mac_x86_64_server.tar.gz build/prefab/full/mac_x86_64_server ballisticakit_mac_x86_64_server - 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 - mv -v build/prefab/full/mac_arm64_server/debug build/prefab/full/mac_arm64_server/ballisticakit_mac_arm64_server From ce10c95da14c40d92291cd820a78d8a06168e98e Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 12:15:24 +0330 Subject: [PATCH 13/40] hopefully final woodpecking session --- .woodpecker/release.yaml | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index d9ac57ab..496da26b 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -7,40 +7,44 @@ steps: image: codeberg.org/3ra/ballistica-dev:latest pull: true commands: - - make prefab-windows-x86-gui-debug-build - - make prefab-linux-x86-64-gui-debug-build - make prefab-linux-arm64-gui-debug-build + - make prefab-linux-x86-64-gui-debug-build - make prefab-mac-arm64-gui-debug-build - - make prefab-windows-x86-server-debug-build - - make prefab-linux-x86-64-server-debug-build + - make prefab-windows-x86-gui-debug-build - make prefab-linux-arm64-server-debug-build + - make prefab-linux-x86-64-server-debug-build - make prefab-mac-arm64-server-debug-build - - mv -v build/prefab/full/linux_x86_64_gui/debug build/prefab/full/linux_x86_64_gui/ballisticakit_linux_x86_64 - - tar cvzfC ballisticakit_linux_x86_64.tar.gz build/prefab/full/linux_x86_64_gui ballisticakit_linux_x86_64 + - make prefab-windows-x86-server-debug-build - 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/mac_arm64_gui/debug build/prefab/full/mac_arm64_gui/ballisticakit_mac_arm64 - - tar cvzfC ballisticakit_mac_arm64.tar.gz build/prefab/full/mac_arm64_gui ballisticakit_mac_arm64 - - mv -v build/prefab/full/linux_x86_64_server/debug build/prefab/full/linux_x86_64_server/ballisticakit_linux_x86_64_server - - tar cvzfC ballisticakit_linux_x86_64_server.tar.gz build/prefab/full/linux_x86_64_server ballisticakit_linux_x86_64_server + - mv -v build/prefab/full/linux_x86_64_gui/debug build/prefab/full/linux_x86_64_gui/ballisticakit_linux_x86_64 + - tar cvzfC ballisticakit_linux_x86_64.tar.gz build/prefab/full/linux_x86_64_gui ballisticakit_linux_x86_64 + - mv -v build/prefab/full/mac_arm64_gui/debug build/prefab/full/mac_arm64_gui/ballisticakit_mac + - 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 + - zip -r ballisticakit_windows.zip build/prefab/full/windows_x86_gui - 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 - - mv -v build/prefab/full/mac_arm64_server/debug build/prefab/full/mac_arm64_server/ballisticakit_mac_arm64_server - - tar cvzfC ballisticakit_mac_arm64_server.tar.gz build/prefab/full/mac_arm64_server ballisticakit_mac_arm64_server + - mv -v build/prefab/full/linux_x86_64_server/debug build/prefab/full/linux_x86_64_server/ballisticakit_linux_x86_64_server + - tar cvzfC ballisticakit_linux_x86_64_server.tar.gz build/prefab/full/linux_x86_64_server ballisticakit_linux_x86_64_server + - mv -v build/prefab/full/mac_arm64_server/debug build/prefab/full/mac_arm64_server/ballisticakit_mac_server + - 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 + - zip -r ballisticakit_windows_server.zip build/prefab/full/windows_x86_server - name: publish image: woodpeckerci/plugin-release settings: api_key: from_secret: ACCESS_TOKEN files: - - 'ballisticakit_linux_x86_64.tar.gz' - - 'ballisticakit_mac_x86_64.tar.gz' - 'ballisticakit_linux_arm64.tar.gz' - - 'ballisticakit_mac_arm64.tar.gz' - - 'ballisticakit_linux_x86_64_server.tar.gz' - - 'ballisticakit_mac_x86_64_server.tar.gz' + - 'ballisticakit_linux_x86_64.tar.gz' + - 'ballisticakit_mac.tar.gz' + - 'ballisticakit_windows.zip' - 'ballisticakit_linux_arm64_server.tar.gz' - - 'ballisticakit_mac_arm64_server.tar.gz' + - 'ballisticakit_linux_x86_64_server.tar.gz' + - 'ballisticakit_mac_server.tar.gz' + - 'ballisticakit_windows_server.zip' 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] From 024ffd8a96690c73303d6cd840264310716875e6 Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 12:20:14 +0330 Subject: [PATCH 14/40] nope --- .woodpecker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/Dockerfile b/.woodpecker/Dockerfile index 6d69bf1b..0e919c34 100644 --- a/.woodpecker/Dockerfile +++ b/.woodpecker/Dockerfile @@ -1,5 +1,5 @@ FROM python:3.12 -RUN apt update && apt -y upgrade && apt -y --no-install-recommends install libopenal-dev libsdl2-dev libvorbis-dev cmake clang-format rsync +RUN apt update && apt -y upgrade && apt -y --no-install-recommends install libopenal-dev libsdl2-dev libvorbis-dev cmake clang-format rsync zip RUN pip install --upgrade pip COPY config/requirements.txt ballistica_requirements.txt RUN pip install -r ballistica_requirements.txt From ae01fd6c1f5d67715ec8090f31eb6b1fb90bd009 Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 12:40:31 +0330 Subject: [PATCH 15/40] haah --- .woodpecker/release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 496da26b..75ad71dc 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -22,7 +22,7 @@ steps: - mv -v build/prefab/full/mac_arm64_gui/debug build/prefab/full/mac_arm64_gui/ballisticakit_mac - 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 - - zip -r ballisticakit_windows.zip build/prefab/full/windows_x86_gui + - zip -jr ballisticakit_windows.zip build/prefab/full/windows_x86_gui - 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 - mv -v build/prefab/full/linux_x86_64_server/debug build/prefab/full/linux_x86_64_server/ballisticakit_linux_x86_64_server @@ -30,7 +30,7 @@ steps: - mv -v build/prefab/full/mac_arm64_server/debug build/prefab/full/mac_arm64_server/ballisticakit_mac_server - 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 - - zip -r ballisticakit_windows_server.zip build/prefab/full/windows_x86_server + - zip -jr ballisticakit_windows_server.zip build/prefab/full/windows_x86_server - name: publish image: woodpeckerci/plugin-release settings: From 65a7294b7e2dd6e467c9e8d12088672f91e250bf Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 14:47:05 +0330 Subject: [PATCH 16/40] more --- .woodpecker/ballistica_dev_image.yaml | 2 +- .woodpecker/ci/build_and_test.yaml | 14 ++++++++++++++ .woodpecker/ci/check.yaml | 13 +++++++++++++ .woodpecker/ci/feature_set_copy_test.yaml | 16 ++++++++++++++++ .woodpecker/ci/spinoff_test.yaml | 14 ++++++++++++++ .woodpecker/release.yaml | 9 ++++++--- 6 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 .woodpecker/ci/build_and_test.yaml create mode 100644 .woodpecker/ci/check.yaml create mode 100644 .woodpecker/ci/feature_set_copy_test.yaml create mode 100644 .woodpecker/ci/spinoff_test.yaml diff --git a/.woodpecker/ballistica_dev_image.yaml b/.woodpecker/ballistica_dev_image.yaml index 0db9e545..155e96b1 100644 --- a/.woodpecker/ballistica_dev_image.yaml +++ b/.woodpecker/ballistica_dev_image.yaml @@ -2,7 +2,7 @@ when: - event: manual steps: - - name: buildx + - name: build_and_publish image: woodpeckerci/plugin-kaniko settings: dockerfile: .woodpecker/Dockerfile diff --git a/.woodpecker/ci/build_and_test.yaml b/.woodpecker/ci/build_and_test.yaml new file mode 100644 index 00000000..82a4d68c --- /dev/null +++ b/.woodpecker/ci/build_and_test.yaml @@ -0,0 +1,14 @@ +when: + - event: push + - event: pull_request + - event: cron + cron: ci + +steps: + - name: linux + 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/ci/check.yaml b/.woodpecker/ci/check.yaml new file mode 100644 index 00000000..60606f4f --- /dev/null +++ b/.woodpecker/ci/check.yaml @@ -0,0 +1,13 @@ +when: + - event: push + - event: pull_request + - event: cron + cron: ci + +steps: + - name: linux + image: codeberg.org/3ra/ballistica-dev:latest + pull: true + commands: + - make env + - BA_PCOMMANDBATCH_BUILD_REQUIRE=1 make check diff --git a/.woodpecker/ci/feature_set_copy_test.yaml b/.woodpecker/ci/feature_set_copy_test.yaml new file mode 100644 index 00000000..61ea7fdd --- /dev/null +++ b/.woodpecker/ci/feature_set_copy_test.yaml @@ -0,0 +1,16 @@ +when: + - event: push + - event: pull_request + - event: cron + cron: ci + +steps: + - name: linux + 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/ci/spinoff_test.yaml b/.woodpecker/ci/spinoff_test.yaml new file mode 100644 index 00000000..35e7be33 --- /dev/null +++ b/.woodpecker/ci/spinoff_test.yaml @@ -0,0 +1,14 @@ +when: + - event: push + - event: pull_request + - event: cron + cron: ci + +steps: + - name: linux + image: codeberg.org/3ra/ballistica-dev:latest + pull: true + commands: + - make env + - make spinoff-test-core + - make spinoff-test-base diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 75ad71dc..41bbdefa 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -22,7 +22,9 @@ steps: - mv -v build/prefab/full/mac_arm64_gui/debug build/prefab/full/mac_arm64_gui/ballisticakit_mac - 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 - - zip -jr ballisticakit_windows.zip build/prefab/full/windows_x86_gui + - cd build/prefab/full/windows_x86_gui + - zip -r ../../../../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 - mv -v build/prefab/full/linux_x86_64_server/debug build/prefab/full/linux_x86_64_server/ballisticakit_linux_x86_64_server @@ -30,7 +32,9 @@ steps: - mv -v build/prefab/full/mac_arm64_server/debug build/prefab/full/mac_arm64_server/ballisticakit_mac_server - 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 - - zip -jr ballisticakit_windows_server.zip build/prefab/full/windows_x86_server + - cd build/prefab/full/windows_x86_server + - zip -r ../../../../ballisticakit_windows_server.zip ballisticakit_windows_server + - cd ../../../.. - name: publish image: woodpeckerci/plugin-release settings: @@ -47,4 +51,3 @@ steps: - 'ballisticakit_windows_server.zip' 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] From c24c42d1963b4b20b9c7a2d6a88da200e9a45e9b Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 14:51:15 +0330 Subject: [PATCH 17/40] oops mb --- .woodpecker/{ci/build_and_test.yaml => ci_build_and_test.yaml} | 0 .woodpecker/{ci/check.yaml => ci_check.yaml} | 0 .../feature_set_copy_test.yaml => ci_feature_set_copy_test.yaml} | 0 .woodpecker/{ci/spinoff_test.yaml => ci_spinoff_test.yaml} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename .woodpecker/{ci/build_and_test.yaml => ci_build_and_test.yaml} (100%) rename .woodpecker/{ci/check.yaml => ci_check.yaml} (100%) rename .woodpecker/{ci/feature_set_copy_test.yaml => ci_feature_set_copy_test.yaml} (100%) rename .woodpecker/{ci/spinoff_test.yaml => ci_spinoff_test.yaml} (100%) diff --git a/.woodpecker/ci/build_and_test.yaml b/.woodpecker/ci_build_and_test.yaml similarity index 100% rename from .woodpecker/ci/build_and_test.yaml rename to .woodpecker/ci_build_and_test.yaml diff --git a/.woodpecker/ci/check.yaml b/.woodpecker/ci_check.yaml similarity index 100% rename from .woodpecker/ci/check.yaml rename to .woodpecker/ci_check.yaml diff --git a/.woodpecker/ci/feature_set_copy_test.yaml b/.woodpecker/ci_feature_set_copy_test.yaml similarity index 100% rename from .woodpecker/ci/feature_set_copy_test.yaml rename to .woodpecker/ci_feature_set_copy_test.yaml diff --git a/.woodpecker/ci/spinoff_test.yaml b/.woodpecker/ci_spinoff_test.yaml similarity index 100% rename from .woodpecker/ci/spinoff_test.yaml rename to .woodpecker/ci_spinoff_test.yaml From af0abb228ae7ad015d89594211cc55681be1f8b9 Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 16:35:10 +0330 Subject: [PATCH 18/40] 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', From 504d61172240a66d225de55e4a9de7b4fff05b8f Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 16:38:47 +0330 Subject: [PATCH 19/40] one more --- .woodpecker/ci_build_and_test_windows.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/ci_build_and_test_windows.yaml b/.woodpecker/ci_build_and_test_windows.yaml index cfd40ec9..d8ceee8a 100644 --- a/.woodpecker/ci_build_and_test_windows.yaml +++ b/.woodpecker/ci_build_and_test_windows.yaml @@ -7,6 +7,7 @@ when: steps: - name: build-and-test image: python:3.12-windowsservercore + pull: true commands: - $env:PYTHONPATH = "tools" - python -m efrotools.genwrapper pcommand batools.pcommandmain tools/pcommand From 8b0f7fd552d1d989a560a359d3dcea9a60d9b05f Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 16:41:51 +0330 Subject: [PATCH 20/40] one more --- .woodpecker/ci_build_and_test_windows.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.woodpecker/ci_build_and_test_windows.yaml b/.woodpecker/ci_build_and_test_windows.yaml index d8ceee8a..f9ff38c8 100644 --- a/.woodpecker/ci_build_and_test_windows.yaml +++ b/.woodpecker/ci_build_and_test_windows.yaml @@ -6,8 +6,7 @@ when: steps: - name: build-and-test - image: python:3.12-windowsservercore - pull: true + image: python:3.12-windowsservercore-ltsc2022 commands: - $env:PYTHONPATH = "tools" - python -m efrotools.genwrapper pcommand batools.pcommandmain tools/pcommand From 60fe09c49204c9bf0e0570f8bac131ac5993755e Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 16:44:56 +0330 Subject: [PATCH 21/40] one more --- .woodpecker/ci_build_and_test_windows.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.woodpecker/ci_build_and_test_windows.yaml b/.woodpecker/ci_build_and_test_windows.yaml index f9ff38c8..370b45b4 100644 --- a/.woodpecker/ci_build_and_test_windows.yaml +++ b/.woodpecker/ci_build_and_test_windows.yaml @@ -1,12 +1,9 @@ when: - - event: push - - event: pull_request - - event: cron - cron: ci + - event: manual steps: - name: build-and-test - image: python:3.12-windowsservercore-ltsc2022 + image: python:3.12-windowsservercore commands: - $env:PYTHONPATH = "tools" - python -m efrotools.genwrapper pcommand batools.pcommandmain tools/pcommand From 69c0e15c625ef189b181f9e82a89b461b9fac5e4 Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 16:52:21 +0330 Subject: [PATCH 22/40] im an idiot --- config/spinoffconfig.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/spinoffconfig.py b/config/spinoffconfig.py index ea563207..995082f3 100644 --- a/config/spinoffconfig.py +++ b/config/spinoffconfig.py @@ -202,11 +202,11 @@ ctx.filter_file_names = { 'ballistica_dev_image.yaml', 'ci_check_linux.yaml', 'ci_build_and_test_linux.yaml', - 'ci_spinoff_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' + 'deploy_docs.yaml', + 'release.yaml', 'LICENSE', 'cloudtool', 'bacloud', From d00640f7b3f0d2db7667af7890dce06d383c2295 Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 17:05:32 +0330 Subject: [PATCH 23/40] docker why --- .woodpecker/ballistica_dev_dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/ballistica_dev_dockerfile b/.woodpecker/ballistica_dev_dockerfile index 0e919c34..99d9bca2 100644 --- a/.woodpecker/ballistica_dev_dockerfile +++ b/.woodpecker/ballistica_dev_dockerfile @@ -1,5 +1,5 @@ FROM python:3.12 -RUN apt update && apt -y upgrade && apt -y --no-install-recommends install libopenal-dev libsdl2-dev libvorbis-dev cmake clang-format rsync zip +RUN apt update && apt -y upgrade && apt -y --no-install-recommends install libopenal-dev libsdl2-dev libvorbis-dev cmake clang-format rsync docker.io zip RUN pip install --upgrade pip COPY config/requirements.txt ballistica_requirements.txt RUN pip install -r ballistica_requirements.txt From 6ae1cf3819b5d6e72430f8cc42cacb8e8b96ab0b Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 17:28:15 +0330 Subject: [PATCH 24/40] docker whyy --- .woodpecker/ballistica_dev_dockerfile | 4 +++- .woodpecker/{ => wip}/ci_build_and_test_windows.yaml | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) rename .woodpecker/{ => wip}/ci_build_and_test_windows.yaml (86%) diff --git a/.woodpecker/ballistica_dev_dockerfile b/.woodpecker/ballistica_dev_dockerfile index 99d9bca2..2ce76666 100644 --- a/.woodpecker/ballistica_dev_dockerfile +++ b/.woodpecker/ballistica_dev_dockerfile @@ -1,5 +1,7 @@ FROM python:3.12 -RUN apt update && apt -y upgrade && apt -y --no-install-recommends install libopenal-dev libsdl2-dev libvorbis-dev cmake clang-format rsync docker.io zip +RUN apt update && apt -y upgrade && apt -y --no-install-recommends install libopenal-dev libsdl2-dev libvorbis-dev cmake clang-format rsync zip +RUN apk add --update docker openrc +RUN rc-update add docker boot RUN pip install --upgrade pip COPY config/requirements.txt ballistica_requirements.txt RUN pip install -r ballistica_requirements.txt diff --git a/.woodpecker/ci_build_and_test_windows.yaml b/.woodpecker/wip/ci_build_and_test_windows.yaml similarity index 86% rename from .woodpecker/ci_build_and_test_windows.yaml rename to .woodpecker/wip/ci_build_and_test_windows.yaml index 370b45b4..cfd40ec9 100644 --- a/.woodpecker/ci_build_and_test_windows.yaml +++ b/.woodpecker/wip/ci_build_and_test_windows.yaml @@ -1,5 +1,8 @@ when: - - event: manual + - event: push + - event: pull_request + - event: cron + cron: ci steps: - name: build-and-test From 18741bb4d477a88c7c439b1fd92094e278d9b705 Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 18:55:42 +0330 Subject: [PATCH 25/40] docker whyyy --- .woodpecker/ballistica_dev_dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.woodpecker/ballistica_dev_dockerfile b/.woodpecker/ballistica_dev_dockerfile index 2ce76666..c09e47ca 100644 --- a/.woodpecker/ballistica_dev_dockerfile +++ b/.woodpecker/ballistica_dev_dockerfile @@ -1,7 +1,5 @@ FROM python:3.12 -RUN apt update && apt -y upgrade && apt -y --no-install-recommends install libopenal-dev libsdl2-dev libvorbis-dev cmake clang-format rsync zip -RUN apk add --update docker openrc -RUN rc-update add docker boot -RUN pip install --upgrade pip COPY config/requirements.txt ballistica_requirements.txt -RUN pip install -r ballistica_requirements.txt +RUN install -m 0755 -d /etc/apt/keyrings; curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc; chmod a+r /etc/apt/keyrings/docker.asc; echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null +RUN apt update; apt -y --no-install-recommends install libopenal-dev libsdl2-dev libvorbis-dev cmake clang-format rsync zip docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin +RUN pip install --upgrade pip; pip install -r ballistica_requirements.txt From 5e8b1045d9bd1c17a36d908596058676682cc39b Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 19:56:40 +0330 Subject: [PATCH 26/40] docker whyyyy --- .woodpecker/release.yaml | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index c990b80d..270e838c 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -3,7 +3,7 @@ when: ref: refs/tags/v* steps: - - name: build + - name: build-general image: codeberg.org/3ra/ballistica-dev:latest pull: true commands: @@ -15,10 +15,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 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 @@ -40,10 +36,30 @@ steps: - cd build/prefab/full/windows_x86_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: build-gui-docker + image: woodpeckerci/plugin-docker-buildx + settings: + dry-run: true + dockerfile: config/docker/Dockerfile + build_args: + - cmake_build_type=Debug + - headless_build=1 + platforms: + - linux/amd64 + output: type=docker,dest=ballisticakit_docker.tar + - name: build-server-docker + image: woodpeckerci/plugin-docker-buildx + settings: + dry-run: true + dockerfile: config/docker/Dockerfile + build_args: + - cmake_build_type=Debug + - headless_build=1 + platforms: + - linux/amd64 + output: type=docker,dest=ballisticakit_server_docker.tar - name: publish image: woodpeckerci/plugin-release settings: From 0d48b2942c341408863aaa9b1dac96c9ae2146c0 Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 20:33:33 +0330 Subject: [PATCH 27/40] parallel stuff --- .woodpecker/ci.yaml | 46 +++++++++++++++++++ .woodpecker/release.yaml | 4 +- .../{ => wip}/ci_build_and_test_linux.yaml | 0 .woodpecker/{ => wip}/ci_check_linux.yaml | 0 .../ci_feature_set_copy_test_linux.yaml | 0 .../{ => wip}/ci_spinoff_test_linux.yaml | 0 config/spinoffconfig.py | 1 + 7 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 .woodpecker/ci.yaml rename .woodpecker/{ => wip}/ci_build_and_test_linux.yaml (100%) rename .woodpecker/{ => wip}/ci_check_linux.yaml (100%) rename .woodpecker/{ => wip}/ci_feature_set_copy_test_linux.yaml (100%) rename .woodpecker/{ => wip}/ci_spinoff_test_linux.yaml (100%) diff --git a/.woodpecker/ci.yaml b/.woodpecker/ci.yaml new file mode 100644 index 00000000..89618e38 --- /dev/null +++ b/.woodpecker/ci.yaml @@ -0,0 +1,46 @@ +when: + - event: push + - event: pull_request + - event: cron + cron: ci + +steps: + - name: parallel-prepare + image: codeberg.org/3ra/ballistica-dev:latest + pull: true + commands: + - make env + - cd .. + - cp -r -v $CI_REPO_NAME check_linux + - cp -r -v $CI_REPO_NAME build_and_test_linux + - cp -r -v $CI_REPO_NAME spinoff_test_linux + - cp -r -v $CI_REPO_NAME feature_set_copy_test_linux + - name: check-linux + image: codeberg.org/3ra/ballistica-dev:latest + commands: + - cd check_linux + - BA_PCOMMANDBATCH_BUILD_REQUIRE=1 make check + depends_on: [parallel-prepare] + - name: build-and-test-linux + image: codeberg.org/3ra/ballistica-dev:latest + commands: + - cd build_and_test_linux + - make cmake-server-build + - BA_PCOMMANDBATCH_BUILD_REQUIRE=1 BA_APP_RUN_ENABLE_BUILDS=1 BA_APP_RUN_BUILD_HEADLESS=1 make test + depends_on: [parallel-prepare] + - name: spinoff-test-linux + image: codeberg.org/3ra/ballistica-dev:latest + commands: + - cd spinoff_test_linux + - make spinoff-test-core + - make spinoff-test-base + depends_on: [parallel-prepare] + - name: feature-set-copy-test-linux + image: codeberg.org/3ra/ballistica-dev:latest + commands: + - cd feature_set_copy_test_linux + - 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)" + depends_on: [parallel-prepare] diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 270e838c..aee418a5 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -36,8 +36,8 @@ 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 - - tar -cvfC ballisticakit_sphinx_docs.tar build ballisticakit_sphinx + - mv -v build/sphinx build/ballisticakit_sphinx_docs + - tar -cvfC ballisticakit_sphinx_docs.tar build/ ballisticakit_sphinx_docs - name: build-gui-docker image: woodpeckerci/plugin-docker-buildx settings: diff --git a/.woodpecker/ci_build_and_test_linux.yaml b/.woodpecker/wip/ci_build_and_test_linux.yaml similarity index 100% rename from .woodpecker/ci_build_and_test_linux.yaml rename to .woodpecker/wip/ci_build_and_test_linux.yaml diff --git a/.woodpecker/ci_check_linux.yaml b/.woodpecker/wip/ci_check_linux.yaml similarity index 100% rename from .woodpecker/ci_check_linux.yaml rename to .woodpecker/wip/ci_check_linux.yaml diff --git a/.woodpecker/ci_feature_set_copy_test_linux.yaml b/.woodpecker/wip/ci_feature_set_copy_test_linux.yaml similarity index 100% rename from .woodpecker/ci_feature_set_copy_test_linux.yaml rename to .woodpecker/wip/ci_feature_set_copy_test_linux.yaml diff --git a/.woodpecker/ci_spinoff_test_linux.yaml b/.woodpecker/wip/ci_spinoff_test_linux.yaml similarity index 100% rename from .woodpecker/ci_spinoff_test_linux.yaml rename to .woodpecker/wip/ci_spinoff_test_linux.yaml diff --git a/config/spinoffconfig.py b/config/spinoffconfig.py index 995082f3..d7f7ea75 100644 --- a/config/spinoffconfig.py +++ b/config/spinoffconfig.py @@ -200,6 +200,7 @@ ctx.filter_file_names = { 'release.yml', 'ballistica_dev_dockerfile', 'ballistica_dev_image.yaml', + 'ci.yaml', 'ci_check_linux.yaml', 'ci_build_and_test_linux.yaml', 'ci_spinoff_test_linux.yaml', From 7ed28d42bbeb379acb241d8c483878a2be49004b Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 20:37:39 +0330 Subject: [PATCH 28/40] fix parallel stuff --- .woodpecker/ci.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.woodpecker/ci.yaml b/.woodpecker/ci.yaml index 89618e38..f1dac411 100644 --- a/.woodpecker/ci.yaml +++ b/.woodpecker/ci.yaml @@ -15,30 +15,31 @@ steps: - cp -r -v $CI_REPO_NAME build_and_test_linux - cp -r -v $CI_REPO_NAME spinoff_test_linux - cp -r -v $CI_REPO_NAME feature_set_copy_test_linux + - cd $CI_REPO_NAME - name: check-linux image: codeberg.org/3ra/ballistica-dev:latest commands: - - cd check_linux + - cd ../check_linux - BA_PCOMMANDBATCH_BUILD_REQUIRE=1 make check depends_on: [parallel-prepare] - name: build-and-test-linux image: codeberg.org/3ra/ballistica-dev:latest commands: - - cd build_and_test_linux + - cd ../build_and_test_linux - make cmake-server-build - BA_PCOMMANDBATCH_BUILD_REQUIRE=1 BA_APP_RUN_ENABLE_BUILDS=1 BA_APP_RUN_BUILD_HEADLESS=1 make test depends_on: [parallel-prepare] - name: spinoff-test-linux image: codeberg.org/3ra/ballistica-dev:latest commands: - - cd spinoff_test_linux + - cd ../spinoff_test_linux - make spinoff-test-core - make spinoff-test-base depends_on: [parallel-prepare] - name: feature-set-copy-test-linux image: codeberg.org/3ra/ballistica-dev:latest commands: - - cd feature_set_copy_test_linux + - cd ../feature_set_copy_test_linux - tools/spinoff fset-copy template_fs poo - make update - make cmake-modular-server-build From a39fbf444f60f1492eefdb7f8bcf865d937b3e08 Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 20:52:31 +0330 Subject: [PATCH 29/40] more parallel stuff --- .woodpecker/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.woodpecker/ci.yaml b/.woodpecker/ci.yaml index f1dac411..c1130b1b 100644 --- a/.woodpecker/ci.yaml +++ b/.woodpecker/ci.yaml @@ -10,6 +10,9 @@ 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 From 70fb2b058f3ae6c3f6167731016c9bc0dbae43e4 Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 22:01:33 +0330 Subject: [PATCH 30/40] 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', From 4d86e4e4baa79125bb46b8a3ca0bee630cdbb3b9 Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 22:47:48 +0330 Subject: [PATCH 31/40] please, no more --- .woodpecker/release.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 18ecdc1c..5077e6ae 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -10,8 +10,6 @@ steps: - 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 @@ -51,7 +49,7 @@ steps: image: woodpeckerci/plugin-docker-buildx settings: dry-run: true - dockerfile: ../build_gui_docker/config/docker/Dockerfile + dockerfile: config/docker/Dockerfile build_args: - cmake_build_type=Debug - headless_build=1 @@ -74,9 +72,10 @@ steps: - name: build-sphinx-docs image: codeberg.org/3ra/ballistica-dev:latest commands: + - cd ../build_sphinx_docs - make docs-sphinx - mv -v build/sphinx build/ballisticakit_sphinx_docs - - tar -cvfC ballisticakit_sphinx_docs.tar build/ ballisticakit_sphinx_docs + - tar cvfC ballisticakit_sphinx_docs.tar build ballisticakit_sphinx_docs depends_on: [parallel-prepare] - name: publish image: woodpeckerci/plugin-release From 9bb4f4cef01bb9c83bd204e3f60f27fd996a3fc6 Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 23:02:24 +0330 Subject: [PATCH 32/40] sigh --- .woodpecker/release.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 5077e6ae..1d91d405 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -74,8 +74,8 @@ steps: commands: - cd ../build_sphinx_docs - make docs-sphinx - - mv -v build/sphinx build/ballisticakit_sphinx_docs - - tar cvfC ballisticakit_sphinx_docs.tar build ballisticakit_sphinx_docs + - mv -v build/sphinx build/ballistica_sphinx_docs + - tar cvfC ballistica_sphinx_docs.tar build ballistica_sphinx_docs depends_on: [parallel-prepare] - name: publish image: woodpeckerci/plugin-release @@ -91,9 +91,9 @@ steps: - '../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' + - 'ballisticakit_docker.tar' + - 'ballisticakit_server_docker.tar' + - '../build_sphinx_docs/ballistica_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] From 5ad8c7850b2bdcb2162407b78b99aafe05062759 Mon Sep 17 00:00:00 2001 From: era Date: Sun, 19 Jan 2025 23:48:31 +0330 Subject: [PATCH 33/40] hopefully final release test --- .woodpecker/release.yaml | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 1d91d405..e3cf0397 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -45,29 +45,43 @@ steps: - zip -rv ../../../../ballisticakit_windows_server.zip ballisticakit_windows_server - cd ../../../.. depends_on: [parallel-prepare] - - name: build-gui-docker - image: woodpeckerci/plugin-docker-buildx + - name: build-and-publish-gui-docker + image: woodpeckerci/plugin-kaniko settings: - dry-run: true + registry: codeberg.org + repo: ${CI_REPO} + tags: + - latest-debug + - latest-gui-debug + - ${CI_COMMIT_TAG}-debug + - ${CI_COMMIT_TAG}-gui-debug + username: ${CI_REPO_OWNER} + password: + from_secret: ACCESS_TOKEN dockerfile: config/docker/Dockerfile build_args: - cmake_build_type=Debug - - headless_build=1 + - headless_build=0 platforms: - linux/amd64 - output: type=docker,dest=ballisticakit_docker.tar depends_on: [parallel-prepare] - - name: build-server-docker - image: woodpeckerci/plugin-docker-buildx + - name: build-and-publish-server-docker + image: woodpeckerci/plugin-kaniko settings: - dry-run: true + registry: codeberg.org + repo: ${CI_REPO} + tags: + - latest-server-debug + - ${CI_COMMIT_TAG}-server-debug + username: ${CI_REPO_OWNER} + password: + from_secret: ACCESS_TOKEN dockerfile: config/docker/Dockerfile build_args: - cmake_build_type=Debug - headless_build=1 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 @@ -77,7 +91,7 @@ steps: - mv -v build/sphinx build/ballistica_sphinx_docs - tar cvfC ballistica_sphinx_docs.tar build ballistica_sphinx_docs depends_on: [parallel-prepare] - - name: publish + - name: release image: woodpeckerci/plugin-release settings: api_key: @@ -91,9 +105,7 @@ steps: - '../build_prefabs/ballisticakit_linux_x86_64_server.tar.gz' - '../build_prefabs/ballisticakit_mac_server.tar.gz' - '../build_prefabs/ballisticakit_windows_server.zip' - - 'ballisticakit_docker.tar' - - 'ballisticakit_server_docker.tar' - '../build_sphinx_docs/ballistica_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] + depends_on: [build-prefabs, build-sphinx-docs] From b2c82183e872ce89f06a8e60b4d7879aa7d8b5ae Mon Sep 17 00:00:00 2001 From: era Date: Mon, 20 Jan 2025 00:04:44 +0330 Subject: [PATCH 34/40] hopefully final release test again --- .woodpecker/release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index e3cf0397..50abcb3e 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -46,7 +46,7 @@ steps: - cd ../../../.. depends_on: [parallel-prepare] - name: build-and-publish-gui-docker - image: woodpeckerci/plugin-kaniko + image: woodpeckerci/plugin-docker-buildx settings: registry: codeberg.org repo: ${CI_REPO} @@ -66,7 +66,7 @@ steps: - linux/amd64 depends_on: [parallel-prepare] - name: build-and-publish-server-docker - image: woodpeckerci/plugin-kaniko + image: woodpeckerci/plugin-docker-buildx settings: registry: codeberg.org repo: ${CI_REPO} From 7da88dcf30554fef555b6ecfd29753c5bc5b5426 Mon Sep 17 00:00:00 2001 From: era Date: Mon, 20 Jan 2025 00:17:52 +0330 Subject: [PATCH 35/40] test --- .woodpecker/ballistica_dev_image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/ballistica_dev_image.yaml b/.woodpecker/ballistica_dev_image.yaml index 4858b765..ddb63c0c 100644 --- a/.woodpecker/ballistica_dev_image.yaml +++ b/.woodpecker/ballistica_dev_image.yaml @@ -3,7 +3,7 @@ when: steps: - name: build-and-publish - image: woodpeckerci/plugin-kaniko + image: woodpeckerci/plugin-docker-buildx settings: dockerfile: .woodpecker/ballistica_dev_dockerfile registry: codeberg.org From b9d1ab461432065e37ebd38a819ff743af416bd5 Mon Sep 17 00:00:00 2001 From: era Date: Mon, 20 Jan 2025 07:37:10 +0330 Subject: [PATCH 36/40] now i really feel like an idiot --- .woodpecker/ballistica_dev_image.yaml | 2 +- .woodpecker/release.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.woodpecker/ballistica_dev_image.yaml b/.woodpecker/ballistica_dev_image.yaml index ddb63c0c..ab323344 100644 --- a/.woodpecker/ballistica_dev_image.yaml +++ b/.woodpecker/ballistica_dev_image.yaml @@ -7,7 +7,7 @@ steps: settings: dockerfile: .woodpecker/ballistica_dev_dockerfile registry: codeberg.org - repo: ${CI_REPO}-dev + repo: codeberg.org/${CI_REPO}-dev tag: latest username: ${CI_REPO_OWNER} password: diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 50abcb3e..cdfa0577 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -49,7 +49,7 @@ steps: image: woodpeckerci/plugin-docker-buildx settings: registry: codeberg.org - repo: ${CI_REPO} + repo: codeberg.org/${CI_REPO} tags: - latest-debug - latest-gui-debug @@ -69,7 +69,7 @@ steps: image: woodpeckerci/plugin-docker-buildx settings: registry: codeberg.org - repo: ${CI_REPO} + repo: codeberg.org/${CI_REPO} tags: - latest-server-debug - ${CI_COMMIT_TAG}-server-debug From 37f8e787a2ea41dc838a8264a99d93e38cd9bcad Mon Sep 17 00:00:00 2001 From: era Date: Mon, 20 Jan 2025 07:44:40 +0330 Subject: [PATCH 37/40] that seems to have fixed it --- .woodpecker/ballistica_dev_image.yaml | 5 ++++- .woodpecker/release.yaml | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.woodpecker/ballistica_dev_image.yaml b/.woodpecker/ballistica_dev_image.yaml index ab323344..540bfe78 100644 --- a/.woodpecker/ballistica_dev_image.yaml +++ b/.woodpecker/ballistica_dev_image.yaml @@ -6,9 +6,12 @@ steps: image: woodpeckerci/plugin-docker-buildx settings: dockerfile: .woodpecker/ballistica_dev_dockerfile + platforms: + - linux/amd64 registry: codeberg.org repo: codeberg.org/${CI_REPO}-dev - tag: latest + tags: + - latest username: ${CI_REPO_OWNER} password: from_secret: ACCESS_TOKEN diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index cdfa0577..2aef8978 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -48,6 +48,12 @@ steps: - name: build-and-publish-gui-docker image: woodpeckerci/plugin-docker-buildx settings: + dockerfile: config/docker/Dockerfile + build_args: + - cmake_build_type=Debug + - headless_build=0 + platforms: + - linux/amd64 registry: codeberg.org repo: codeberg.org/${CI_REPO} tags: @@ -58,16 +64,16 @@ steps: username: ${CI_REPO_OWNER} password: from_secret: ACCESS_TOKEN - dockerfile: config/docker/Dockerfile - build_args: - - cmake_build_type=Debug - - headless_build=0 - platforms: - - linux/amd64 depends_on: [parallel-prepare] - name: build-and-publish-server-docker image: woodpeckerci/plugin-docker-buildx settings: + dockerfile: config/docker/Dockerfile + build_args: + - cmake_build_type=Debug + - headless_build=1 + platforms: + - linux/amd64 registry: codeberg.org repo: codeberg.org/${CI_REPO} tags: @@ -76,12 +82,6 @@ steps: username: ${CI_REPO_OWNER} password: from_secret: ACCESS_TOKEN - dockerfile: config/docker/Dockerfile - build_args: - - cmake_build_type=Debug - - headless_build=1 - platforms: - - linux/amd64 depends_on: [parallel-prepare] - name: build-sphinx-docs image: codeberg.org/3ra/ballistica-dev:latest From 9f0b772d8514ef55810b7bd28195a145109451ef Mon Sep 17 00:00:00 2001 From: era Date: Mon, 20 Jan 2025 08:07:36 +0330 Subject: [PATCH 38/40] final tag test --- .woodpecker/ballistica_dev_image.yaml | 2 -- .woodpecker/release.yaml | 9 +++------ config/spinoffconfig.py | 1 + 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.woodpecker/ballistica_dev_image.yaml b/.woodpecker/ballistica_dev_image.yaml index 540bfe78..0d60cdef 100644 --- a/.woodpecker/ballistica_dev_image.yaml +++ b/.woodpecker/ballistica_dev_image.yaml @@ -6,8 +6,6 @@ steps: image: woodpeckerci/plugin-docker-buildx settings: dockerfile: .woodpecker/ballistica_dev_dockerfile - platforms: - - linux/amd64 registry: codeberg.org repo: codeberg.org/${CI_REPO}-dev tags: diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 2aef8978..8fef0fb3 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -57,10 +57,8 @@ steps: registry: codeberg.org repo: codeberg.org/${CI_REPO} tags: - - latest-debug - - latest-gui-debug - - ${CI_COMMIT_TAG}-debug - - ${CI_COMMIT_TAG}-gui-debug + - ${CI_COMMIT_TAG##v}-debug + - ${CI_COMMIT_TAG##v}-gui-debug username: ${CI_REPO_OWNER} password: from_secret: ACCESS_TOKEN @@ -77,8 +75,7 @@ steps: registry: codeberg.org repo: codeberg.org/${CI_REPO} tags: - - latest-server-debug - - ${CI_COMMIT_TAG}-server-debug + - ${CI_COMMIT_TAG##v}-server-debug username: ${CI_REPO_OWNER} password: from_secret: ACCESS_TOKEN diff --git a/config/spinoffconfig.py b/config/spinoffconfig.py index ea8a0e21..7219a9a6 100644 --- a/config/spinoffconfig.py +++ b/config/spinoffconfig.py @@ -202,6 +202,7 @@ ctx.filter_file_names = { 'ballistica_dev_image.yaml', 'ci.yaml', 'ci_build_and_test_windows.yaml', + 'cd.yaml', 'deploy_docs.yaml', 'release.yaml', 'LICENSE', From fe72cf67f6c881b2341e031858e0d3de88d4fc98 Mon Sep 17 00:00:00 2001 From: era Date: Mon, 20 Jan 2025 09:52:21 +0330 Subject: [PATCH 39/40] docs test --- .woodpecker/deploy_docs.yaml | 16 ++++++++++++++++ .woodpecker/release.yaml | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .woodpecker/deploy_docs.yaml diff --git a/.woodpecker/deploy_docs.yaml b/.woodpecker/deploy_docs.yaml new file mode 100644 index 00000000..d8ea8daa --- /dev/null +++ b/.woodpecker/deploy_docs.yaml @@ -0,0 +1,16 @@ +when: + - event: push + branch: woodpecker + +steps: + - name: build + image: codeberg.org/3ra/ballistica-dev:latest + pull: true + commands: + - make docs-sphinx + - name: deploy + image: codeberg.org/xfix/plugin-codeberg-pages-deploy:1 + settings: + folder: build/sphinx + ssh_key: + from_secret: SSH_KEY diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 8fef0fb3..1e9a8aa5 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -103,6 +103,6 @@ steps: - '../build_prefabs/ballisticakit_mac_server.tar.gz' - '../build_prefabs/ballisticakit_windows_server.zip' - '../build_sphinx_docs/ballistica_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' + note: 'These are debug prefab builds; use them for testing purposes only. Docker versions of this release also exist at https://codeberg.org/3ra/-/packages/container/ballistica. Check out https://ballistica.net/downloads for official/blessed release builds.' title: ${CI_COMMIT_TAG} depends_on: [build-prefabs, build-sphinx-docs] From 388dba2644c46974ebb8f471ca15353bfd194ecc Mon Sep 17 00:00:00 2001 From: era Date: Mon, 20 Jan 2025 10:01:11 +0330 Subject: [PATCH 40/40] finalize --- .woodpecker/deploy_docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/deploy_docs.yaml b/.woodpecker/deploy_docs.yaml index d8ea8daa..d0dcca27 100644 --- a/.woodpecker/deploy_docs.yaml +++ b/.woodpecker/deploy_docs.yaml @@ -1,6 +1,6 @@ when: - event: push - branch: woodpecker + branch: main steps: - name: build