update build

use docker container
bucanero · Jul 9, 2024 · b79ca63 · b79ca63
1 parent bb8566a
commit b79ca63
Showing 1 changed file with 13 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,34 +5,32 @@ on: [ push, pull_request, workflow_dispatch ]
 jobs:
   build_pkg:
     runs-on: ubuntu-22.04
+    container: pspdev/pspdev:latest
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
+
+    - name: Install dependencies
+      run: |
+        apk add zip
 
     - name: Checkout apollo-lib
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: bucanero/apollo-lib
         path: apollo-lib
 
     - name: Checkout dbglogger
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: bucanero/dbglogger
         path: dbglogger
 
-      # install latest pspdev sdk
-    - name: Download PSP SDK
-      run: |
-        curl -sL https://github.com/pspdev/pspdev/releases/download/latest/pspdev-ubuntu-latest.tar.gz | tar xvz -C ./
-        sed -i '64s/.*/INTERFACE_LINK_LIBRARIES "${PSPDEV}\/psp\/lib\/libmbedtls.a;${PSPDEV}\/psp\/lib\/libmbedx509.a;${PSPDEV}\/psp\/lib\/libmbedcrypto.a;ZLIB::ZLIB"/' pspdev/psp/lib/cmake/CURL/CURLTargets.cmake
-
-    - name: Set env vars
+    - name: Get short SHA
+      id: slug
       run: |
-        echo "sha_name=$(echo ${GITHUB_SHA} | cut -c1-8)" >> $GITHUB_ENV
-        echo "PSPDEV=${GITHUB_WORKSPACE}/pspdev" >> $GITHUB_ENV
-        echo "${GITHUB_WORKSPACE}/pspdev/bin" >> $GITHUB_PATH
+        printf '%s\n' "sha8=$(printf '%s\n' ${GITHUB_SHA} | cut -c1-8)" >> $GITHUB_OUTPUT
 
     - name: Install dbglogger
       working-directory: dbglogger
@@ -51,8 +49,8 @@ jobs:
         make createzip
 
     - name: Push package artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: apollo-psp-build_${{ env.sha_name }}
+        name: apollo-psp-build_${{ steps.slug.outputs.sha8 }}
         path: apollo-psp.zip
         if-no-files-found: error