From d0acdc2964e77dcc3d0e15e54e7bd36d8bb6fa51 Mon Sep 17 00:00:00 2001 From: Thomas Rohloff Date: Thu, 26 Jun 2025 10:41:52 +0200 Subject: [PATCH] Docker CI: Remove build.sh and artifacts Signed-off-by: Thomas Rohloff --- .github/workflows/main.yml | 25 ++++++++++--------------- build.sh | 17 ----------------- 2 files changed, 10 insertions(+), 32 deletions(-) delete mode 100755 build.sh diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8035d8f2a..9f19d5725 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -301,25 +301,20 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 + with: + submodules: recursive - name: Build docker image if: steps.cache.outputs.cache-hit != 'true' run: docker build . -t spaghetti - - name: Build AppImage - run: docker run --rm -v ${PWD}:/project spaghetti ./build.sh - - name: Prepare Artifact - run: | - wget -O gamecontrollerdb.txt https://github.com/mdqinc/SDL_GameControllerDB/blob/master/gamecontrollerdb.txt - mv README.md readme.txt - cp build-cmake/*.appimage spaghetti.appimage - - name: Upload build - uses: actions/upload-artifact@v4 + - name: Confiure + run: docker run --rm -v ${PWD}:/project spaghetti cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release + - name: Download spaghetti.o2r + uses: actions/download-artifact@v4 with: - name: Spaghettify-linux-docker - path: | - spaghetti.appimage - config.yml - yamls - gamecontrollerdb.txt + name: spaghetti.o2r + path: ./build-cmake + - name: Build spaghetti + run: cmake --build build-cmake --config Release -j$(nproc) build-switch: needs: generate-port-o2r diff --git a/build.sh b/build.sh deleted file mode 100755 index 65fb90e6d..000000000 --- a/build.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -# Init git submodules -git config --global --add safe.directory /project -git submodule update --init - -# Build spaghetti.o2r -cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release -cmake --build build-cmake --target GenerateO2R -j$(nproc) - -# Build spaghetti executable -cmake --build build-cmake --config Release -j$(nproc) - -# Pack AppImage -cd build-cmake -cpack -G External -cd ..