From ec0357587efc118db56bed905a56aef4e1e53a3c Mon Sep 17 00:00:00 2001 From: kub Date: Thu, 26 Oct 2023 23:10:17 +0200 Subject: [PATCH] build, cleanup after toolchain container changes --- .github/workflows/ci.yml | 36 +++++++++++++++++++----------------- tools/release.sh | 35 ++++++++++++++++++----------------- 2 files changed, 37 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e22d343e..5db92205 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: - name: configure run: DUMP_CONFIG_LOG=1 ./configure - name: make - run: make + run: make -j2 build-libretro: runs-on: ubuntu-latest @@ -35,7 +35,7 @@ jobs: with: submodules: true - name: make - run: LDFLAGS=-Wl,--no-undefined make -f Makefile.libretro + run: LDFLAGS=-Wl,--no-undefined make -j2 -f Makefile.libretro build-gp2x: @@ -52,8 +52,8 @@ jobs: run: | git config --global --add safe.directory $PWD ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD) - CROSS_COMPILE=arm-none-eabi- ./configure --platform=gp2x - make PLATFORM_MP3=0 + ./configure --platform=gp2x + make -j2 PLATFORM_MP3=0 make -C platform/gp2x rel VER=$ver mv PicoDrive_$ver.zip PicoDrive-gph_$ver.zip - name: artifacts @@ -81,7 +81,7 @@ jobs: git config --global --add safe.directory $PWD ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD) ./configure --platform=pandora - make + make -j2 mv PicoDrive PicoDrive-pandora ${CROSS_COMPILE}strip PicoDrive-pandora - name: artifacts @@ -109,10 +109,11 @@ jobs: submodules: true - name: build run: | + export CROSS_COMPILE=psp- git config --global --add safe.directory $PWD ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD) - CROSS_COMPILE=psp- ./configure --platform=psp - CROSS_COMPILE=psp- make + ./configure --platform=psp + make -j2 make -C platform/psp rel VER=$ver - name: artifacts uses: actions/upload-artifact@v3 @@ -141,8 +142,8 @@ jobs: run: | git config --global --add safe.directory $PWD ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD) - CROSS_COMPILE=mipsel-linux- ./configure --platform=dingux - CROSS_COMPILE=mipsel-linux- make + ./configure --platform=dingux + make -j2 mv PicoDrive-dge.zip PicoDrive-dge-$ver.zip - name: artifacts uses: actions/upload-artifact@v3 @@ -168,8 +169,8 @@ jobs: run: | git config --global --add safe.directory $PWD ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD) - CROSS_COMPILE=mipsel-linux- ./configure --platform=gcw0 - CROSS_COMPILE=mipsel-linux- make + ./configure --platform=gcw0 + make -j2 mv PicoDrive.opk PicoDrive-gcw0-$ver.opk - name: artifacts uses: actions/upload-artifact@v3 @@ -195,8 +196,8 @@ jobs: run: | git config --global --add safe.directory $PWD ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD) - CROSS_COMPILE=mipsel-linux- ./configure --platform=opendingux - CROSS_COMPILE=mipsel-linux- make + ./configure --platform=opendingux + make -j2 mv PicoDrive.opk PicoDrive-opendingux-$ver.opk - name: artifacts uses: actions/upload-artifact@v3 @@ -222,10 +223,11 @@ jobs: submodules: true - name: build run: | + export CROSS_COMPILE=arm-buildroot-linux-musleabi- git config --global --add safe.directory /home/picodrive ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD) - CROSS_COMPILE=arm-buildroot-linux-musleabi- ./configure --platform=miyoo - CROSS_COMPILE=arm-buildroot-linux-musleabi- make + ./configure --platform=miyoo + make -j2 mv PicoDrive.zip PicoDrive-miyoo-$ver.zip - name: artifacts uses: actions/upload-artifact@v3 @@ -251,8 +253,8 @@ jobs: run: | git config --global --add safe.directory $PWD ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD) - CROSS_COMPILE=mipsel-RetroFW-linux-uclibc- ./configure --platform=retrofw - CROSS_COMPILE=mipsel-RetroFW-linux-uclibc- make + ./configure --platform=retrofw + make -j2 mv PicoDrive.opk PicoDrive-retrofw-$ver.opk - name: artifacts uses: actions/upload-artifact@v3 diff --git a/tools/release.sh b/tools/release.sh index 57487ac6..0e071eaa 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -28,8 +28,8 @@ shift; plat=" $* " # GPH devices: gp2x, wiz, caanoo, with ubuntu arm gcc 4.7 docker pull ghcr.io/irixxxx/toolchain-gp2x echo " git config --global --add safe.directory /home/picodrive &&\ - CROSS_COMPILE=arm-none-eabi- ./configure --platform=gp2x &&\ - make clean all &&\ + ./configure --platform=gp2x &&\ + make clean && make -j2 all &&\ make -C platform/gp2x rel VER=$rel "\ | docker run -i -v$PWD:/home/picodrive -w/home/picodrive --rm ghcr.io/irixxxx/toolchain-gp2x sh && mv PicoDrive_$rel.zip release-$rel/PicoDrive-gph_$rel.zip @@ -40,8 +40,8 @@ mv PicoDrive_$rel.zip release-$rel/PicoDrive-gph_$rel.zip # NB works for legacy dingux and possibly opendingux before gcw0 docker pull ghcr.io/irixxxx/toolchain-dingux echo " git config --global --add safe.directory /home/picodrive &&\ - CROSS_COMPILE=mipsel-linux- ./configure --platform=dingux &&\ - CROSS_COMPILE=mipsel-linux- make clean all "\ + ./configure --platform=dingux &&\ + make clean && make -j2 all "\ | docker run -i -v$PWD:/home/picodrive -w/home/picodrive --rm ghcr.io/irixxxx/toolchain-dingux sh && mv PicoDrive-dge.zip release-$rel/PicoDrive-dge_$rel.zip } @@ -50,8 +50,8 @@ mv PicoDrive-dge.zip release-$rel/PicoDrive-dge_$rel.zip # retrofw: rs-97 and similar, JZ4760 (mips32r1 with fpu) docker pull ghcr.io/irixxxx/toolchain-retrofw echo " git config --global --add safe.directory /home/picodrive &&\ - CROSS_COMPILE=mipsel-RetroFW-linux-uclibc- ./configure --platform=retrofw &&\ - CROSS_COMPILE=mipsel-RetroFW-linux-uclibc- make clean all "\ + ./configure --platform=retrofw &&\ + make clean && make -j2 all "\ | docker run -i -v$PWD:/home/picodrive -w/home/picodrive --rm ghcr.io/irixxxx/toolchain-retrofw sh && mv PicoDrive.opk release-$rel/PicoDrive-retrofw_$rel.opk } @@ -60,8 +60,8 @@ mv PicoDrive.opk release-$rel/PicoDrive-retrofw_$rel.opk # gcw0: JZ4770 (mips32r2 with fpu), swapped X/Y buttons docker pull ghcr.io/irixxxx/toolchain-opendingux echo " git config --global --add safe.directory /home/picodrive &&\ - CROSS_COMPILE=mipsel-linux- ./configure --platform=gcw0 &&\ - CROSS_COMPILE=mipsel-linux- make clean all "\ + ./configure --platform=gcw0 &&\ + make clean && make -j2 all "\ | docker run -i -v$PWD:/home/picodrive -w/home/picodrive --rm ghcr.io/irixxxx/toolchain-opendingux sh && mv PicoDrive.opk release-$rel/PicoDrive-gcw0_$rel.opk } @@ -70,8 +70,8 @@ mv PicoDrive.opk release-$rel/PicoDrive-gcw0_$rel.opk # rg350, gkd350h etc: JZ4770 or newer docker pull ghcr.io/irixxxx/toolchain-opendingux echo " git config --global --add safe.directory /home/picodrive &&\ - CROSS_COMPILE=mipsel-linux- ./configure --platform=opendingux &&\ - CROSS_COMPILE=mipsel-linux- make clean all "\ + ./configure --platform=opendingux &&\ + make clean && make -j2 all "\ | docker run -i -v$PWD:/home/picodrive -w/home/picodrive --rm ghcr.io/irixxxx/toolchain-opendingux sh && mv PicoDrive.opk release-$rel/PicoDrive-opendingux_$rel.opk } @@ -79,9 +79,10 @@ mv PicoDrive.opk release-$rel/PicoDrive-opendingux_$rel.opk [ -z "${plat##* miyoo *}" ] && { # miyoo: BittBoy >=v1, PocketGo, Powkiddy [QV]90/Q20 (Allwinner F1C100s, ARM926) docker pull miyoocfw/toolchain -echo " git config --global --add safe.directory /home/picodrive &&\ - CROSS_COMPILE=arm-buildroot-linux-musleabi- ./configure --platform=miyoo &&\ - CROSS_COMPILE=arm-buildroot-linux-musleabi- make clean all "\ +echo " export CROSS_COMPILE=arm-buildroot-linux-musleabi- &&\ + git config --global --add safe.directory /home/picodrive &&\ + ./configure --platform=miyoo &&\ + make clean && make -j2 all "\ | docker run -i -v$PWD:/home/picodrive -w/home/picodrive --rm miyoocfw/toolchain sh && mv PicoDrive.zip release-$rel/PicoDrive-miyoo_$rel.zip } @@ -89,10 +90,10 @@ mv PicoDrive.zip release-$rel/PicoDrive-miyoo_$rel.zip [ -z "${plat##* psp *}" ] && { # psp (experimental), pspdev SDK toolchain docker pull --platform=linux/amd64 ghcr.io/pspdev/pspdev -echo " apk add git gcc g++ zip &&\ +echo " apk add git gcc g++ zip && export CROSS_COMPILE=psp- &&\ git config --global --add safe.directory /home/picodrive &&\ - CROSS_COMPILE=psp- ./configure --platform=psp &&\ - CROSS_COMPILE=psp- make clean all &&\ + ./configure --platform=psp &&\ + make clean && make -j2 all &&\ make -C platform/psp rel VER=$rel "\ | docker run -i -v$PWD:/home/picodrive -w/home/picodrive --rm ghcr.io/pspdev/pspdev sh && mv PicoDrive_psp_$rel.zip release-$rel/PicoDrive-psp_$rel.zip @@ -103,7 +104,7 @@ mv PicoDrive_psp_$rel.zip release-$rel/PicoDrive-psp_$rel.zip docker pull ghcr.io/irixxxx/toolchain-pandora echo " git config --global --add safe.directory /home/picodrive &&\ ./configure --platform=pandora &&\ - make clean all &&\ + make clean && make -j2 all &&\ \${CROSS_COMPILE}strip -o PicoDrive-pandora-$rel PicoDrive"\ | docker run -i -v$PWD:/home/picodrive -w/home/picodrive --rm ghcr.io/irixxxx/toolchain-pandora sh && mv PicoDrive-pandora-$rel release-$rel/ -- 2.39.2