From d50bc61adae899826629abd1799d36cbbe0702cb Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Fri, 6 Feb 2026 13:54:53 -0600 Subject: [PATCH] Prog --- .ci/dolphin/build-gamecube.sh | 5 ++- .gitea/workflows/build.yml | 59 ++++++++++++++--------------------- 2 files changed, 26 insertions(+), 38 deletions(-) diff --git a/.ci/dolphin/build-gamecube.sh b/.ci/dolphin/build-gamecube.sh index c9779a9..cf46c53 100755 --- a/.ci/dolphin/build-gamecube.sh +++ b/.ci/dolphin/build-gamecube.sh @@ -1,6 +1,6 @@ #!/bin/bash docker build -t myapp:latest -f ./.ci/dolphin/Dockerfile . -docker run -v $PWD:/workdir myapp:latest /bin/bash -c ' \ +docker run -v ./:/workdir myapp:latest /bin/bash -c ' \ export PATH="$DEVKITPPC/bin:$PATH" && \ ls -l && \ cd /workdir && \ @@ -10,5 +10,4 @@ docker run -v $PWD:/workdir myapp:latest /bin/bash -c ' \ cmake -S. -Bbuild-gamecube -DDUSK_TARGET_SYSTEM=gamecube -DCMAKE_TOOLCHAIN_FILE="$DEVKITPRO/cmake/GameCube.cmake" && \ cd build-gamecube && \ make VERBOSE=1 -' -# docker run -it -v ./:/workdir myapp:latest /bin/bash \ No newline at end of file +' \ No newline at end of file diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 521ca26..2029286 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -20,18 +20,7 @@ jobs: apt-get install -y docker.io - name: Build GameCube run: | - echo "Current directory: $(pwd)" - docker build -t myapp:latest -f ./.ci/dolphin/Dockerfile . - docker run -v $PWD:/workdir myapp:latest /bin/bash -c ' \ - export PATH="$DEVKITPPC/bin:$PATH" && \ - ls -l && \ - cd /workdir && \ - ls -l && \ - rm -rf build-gamecube && \ - mkdir -p build-gamecube && \ - cmake -S. -Bbuild-gamecube -DDUSK_TARGET_SYSTEM=gamecube -DCMAKE_TOOLCHAIN_FILE="$DEVKITPRO/cmake/GameCube.cmake" && \ - cd build-gamecube && \ - make VERBOSE=1 + .ci/dolphin/build-gamecube.sh - name: Copy gamecube run: | mkdir -p build/gitea/Gamecube/Dusk @@ -44,29 +33,29 @@ jobs: path: build/gitea/Gamecube if-no-files-found: error - build-wii: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v5 - - name: Install dependencies - run: | - apt-get update - apt-get install -y docker.io - - name: Build Wii - run: | - ./.ci/dolphin/build-wii.sh - - name: Copy wii - run: | - mkdir -p build/gitea/Wii/apps/Dusk - mv build/Dusk.dol build/gitea/Wii/apps/Dusk/boot.dol - mv build/dusk.dsk build/gitea/Wii/apps/Dusk/dusk.dsk - - name: Upload Wii Binary - uses: actions/upload-artifact@v3 - with: - name: dusk-wii - path: build/gitea/Wii - if-no-files-found: error + # build-wii: + # runs-on: ubuntu-latest + # steps: + # - name: Checkout repository + # uses: actions/checkout@v5 + # - name: Install dependencies + # run: | + # apt-get update + # apt-get install -y docker.io + # - name: Build Wii + # run: | + # ./.ci/dolphin/build-wii.sh + # - name: Copy wii + # run: | + # mkdir -p build/gitea/Wii/apps/Dusk + # mv build/Dusk.dol build/gitea/Wii/apps/Dusk/boot.dol + # mv build/dusk.dsk build/gitea/Wii/apps/Dusk/dusk.dsk + # - name: Upload Wii Binary + # uses: actions/upload-artifact@v3 + # with: + # name: dusk-wii + # path: build/gitea/Wii + # if-no-files-found: error run-tests: runs-on: ubuntu-latest