From 98afa285081e811be294eee7fcdfcf7317d4452c Mon Sep 17 00:00:00 2001 From: Francisco Javier Trujillo Mata Date: Wed, 27 Mar 2024 21:27:06 +0100 Subject: [PATCH] Update CI for ps2-packer --- .github/workflows/compilation.yml | 6 ++++-- .github/workflows/docker.yml | 8 ++++---- Dockerfile | 5 ++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index 0efb739..3ff3d3c 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest container: ${{ github.repository_owner }}/ps2sdk:latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install dependencies run: | @@ -19,4 +19,6 @@ jobs: - 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 index c7524db..c7af8a4 100644 --- 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 index 4571f32..1ea9361 100644 --- 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