Merge pull request #39 from fjtrujy/updateCI

Update CI for ps2-packer
ps2dev · Mar 27, 2024 · f31ff8e · f31ff8e
2 parents 26bfd0f + 98afa28
commit f31ff8e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml
@@ -11,12 +11,14 @@ jobs:
     runs-on: ubuntu-latest
     container: ${{ github.repository_owner }}/ps2sdk:latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install dependencies
       run: |
         apk add build-base zlib-dev
 
     - name: Compile project
       run: |
-        make clean all install
+        make -j $(getconf _NPROCESSORS_ONLN) clean
+        make -j $(getconf _NPROCESSORS_ONLN) all
+        make -j $(getconf _NPROCESSORS_ONLN) install
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Extract DOCKER_TAG using tag name
       if: startsWith(github.ref, 'refs/tags/')
@@ -28,13 +28,13 @@ jobs:
         echo "DOCKER_TAG=latest" >> $GITHUB_ENV
       
     - name: Login to Github registry
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         username: ${{ github.actor }}
         password:  ${{ secrets.GITHUB_TOKEN }}
         registry: ghcr.io
 
-    - uses: docker/build-push-action@v2
+    - uses: docker/build-push-action@v5
       with:
         push: true
         tags: ghcr.io/${{ github.repository }}:${{ env.DOCKER_TAG }}
@@ -47,7 +47,7 @@ jobs:
         echo "NEW_DISPATCH_ACTION=$DISPATCH_ACTION" >> $GITHUB_ENV
         
     - name: Repository Dispatch to ps2link
-      uses: peter-evans/repository-dispatch@v2
+      uses: peter-evans/repository-dispatch@v3
       with:
         repository: ${{ github.repository_owner }}/ps2link
         token: ${{ secrets.DISPATCH_TOKEN }}

diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,10 @@ FROM $BASE_DOCKER_IMAGE
 COPY . /src
 
 RUN apk add build-base zlib-dev
-RUN cd /src && make clean all install
+RUN cd /src && \
+    make -j $(getconf _NPROCESSORS_ONLN) clean && \
+    make -j $(getconf _NPROCESSORS_ONLN) && \
+    make -j $(getconf _NPROCESSORS_ONLN) install
 
 # Second stage of Dockerfile
 FROM alpine:latest