CI testing

irixxxx · Sep 19, 2023 · 9d21764 · 9d21764
1 parent ca3f4f1
commit 9d21764
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 29 deletions.
diff --git a/.github/workflows/Dockerfile-opendingux b/.github/workflows/Dockerfile-opendingux
@@ -17,10 +17,10 @@ RUN	wget --no-check-certificate "https://github.com/Ninoh-FOX/toolchain/releases
 	tar xjCf /opt opendingux-gcw0-toolchain.2021-09-08.tar.bz2
 
 # toolchain definitions
-# NB on newer GKD firmware there's a problem with missing exception handlers
-# Undefining those functions and linking in libgcc_eh solves this.
+# NB on newer GKD firmware there's a problem with missing exception handlers in
+# libgcc_s.so. Undefining those functions and linking in libgcc_eh solves this.
 ENV PATH=/opt/gcw0-toolchain-od/usr/bin:$PATH
 ENV TS=/opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot
 ENV CFLAGS="--sysroot $TS -I$TS/usr/include/SDL -mabicalls"
-ENV LDFLAGS="$CFLAGS -Wl,--dynamic-linker=/lib/ld-uClibc.so.0 -u__register_frame_info -u__deregister_frame_info -lgcc_eh"
+ENV LDFLAGS="$CFLAGS -Wl,--dynamic-linker=/lib/ld-uClibc.so.0 -u__register_frame_info -u__deregister_frame_info -L$TS/../lib -lgcc_eh"
 ENV CROSS_COMPILE=mipsel-linux-
diff --git a/.github/workflows/Dockerfile-psp b/.github/workflows/Dockerfile-psp
diff --git a/.github/workflows/ci-psp.yml b/.github/workflows/ci-psp.yml
@@ -10,15 +10,16 @@ jobs:
     - name: build environment
       run: |
         whoami
-        docker build -f .github/workflows/Dockerfile-psp -t build-psp .
+        docker pull --platform=linux/amd64 ghcr.io/pspdev/pspdev
     - name: build
       run: |
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
-        dock="docker run -i -v $PWD:/home/picodrive -w /home/picodrive build-psp"
-        $dock sh -c "git config --global --add safe.directory /home/picodrive"
+        dock="docker run -i -v $PWD:/home/picodrive -w /home/picodrive ghcr.io/pspdev/pspdev"
+        #$dock sh -c "git config --global --add safe.directory /home/picodrive"
         $dock sh -c "CROSS_COMPILE=psp- ./configure --platform=psp"
         $dock sh -c "CROSS_COMPILE=psp- make"
-        $dock sh -c "make -C platform/psp rel VER=$ver"
+        #$dock sh -c "make -C platform/psp rel VER=$ver"
+        make -C platform/psp rel VER=$ver
     - name: artifacts
       uses: actions/upload-artifact@v3
       with: