From 995f830e2e877d442f988dca8e417025f92f783c Mon Sep 17 00:00:00 2001 From: Rebekah Date: Sat, 13 Jul 2024 21:47:29 -0400 Subject: [PATCH] Update .woodpecker.json --- .woodpecker.json | 92 +++++++++++++++++++++++------------------------- 1 file changed, 44 insertions(+), 48 deletions(-) diff --git a/.woodpecker.json b/.woodpecker.json index d4a2244..9956304 100644 --- a/.woodpecker.json +++ b/.woodpecker.json @@ -1,57 +1,53 @@ { - steps: { - alpine-build: { - image: "alpine", - when: { - branch: [ - "main", - "dev", - "woodpecker" - ], - event: ["push", "pull_request", "manual"] - }, - commands: [ - "echo Install development packages", - "apk update", - "apk add build-base cmake glm-dev libx11-dev libxext-dev libxfixes-dev mesa-dev mesa-vulkan-swrast mesa-vulkan-broadcom mesa-vulkan-layers vulkan-validation-layers vulkan-validation-layers-dev", + steps: { + alpine-build: { + image: "alpine", + when: { + branch: [ + "main", + "dev", + "woodpecker" + ], + event: ["push", "pull_request", "manual"] + }, + commands: [ + "echo 'Update Package Manager to Latest.'", + "apk update", - "echo Make build directory", - "mkdir build-alpine", - "echo CMake build make-files", - "cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build-alpine/", + "echo 'Project VulkZample CI building libSDL2pp dependancy!!!'", - "echo Build Project", - "cmake --build build-alpine/", - "time ENABLE_SWRAST=1 sh run.sh", - "time sh run.sh" - ] - }, - ubuntu-build: { - image: "ubuntu", - when: { - branch: [ - "main", - "dev", - "woodpecker" - ], - event: ["push", "pull_request", "manual"] - }, - commands: [ - "echo Install development packages", - "apt update", - "apt install -y build-essential cmake libglm-dev libglew-dev libx11-dev libxext-dev libxfixes-dev", + "echo 'Install libSDL2pp's build dependancies packages'", + "apk add build-base cmake sdl2-dev", - "echo Make build directory", - "mkdir build-ubuntu", + "echo 'Clone libSDL2pp'", + "git clone https://github.com/libSDL2pp/libSDL2pp/ /tmp/libSDL2pp-alpine", - "echo CMake build make-files", - "cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build-ubuntu/", + "echo 'CMake generate make-files'", + "cmake -DCMAKE_BUILD_TYPE=Release -S /tmp/libSDL2pp-alpine/ -B /tmp/libSDL2pp-alpine/build/", - "echo Build Project", - "cmake --build build-ubuntu/", - "cmake --install build-ubuntu/" - ] + "echo 'Build libSDL2pp'", + "cmake --build /tmp/libSDL2pp-alpine/build/", + + "echo 'Install libSDL2pp'", + "cmake --install /tmp/libSDL2pp-alpine/build/", + + "echo 'Dependancy builds finished.'", + + + "echo 'Project VulkZample CI now building the actual project!!!'", + + "echo Install development packages", + "apk add build-base cmake glm-dev mesa-dev mesa-vulkan-swrast mesa-vulkan-broadcom mesa-vulkan-layers vulkan-validation-layers vulkan-validation-layers-dev sdl2-dev", + + "echo CMake build make-files", + "cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build-alpine/", + + "echo Build Project", + "cmake --build build-alpine/", + "time ENABLE_SWRAST=1 sh run.sh", + "time sh run.sh" + ] + } } - } }