Skip to content

Commit

Permalink
Merge pull request #138 from fjtrujy/updateCI
Browse files Browse the repository at this point in the history
Update CI
  • Loading branch information
fjtrujy authored Mar 27, 2024
2 parents 8d89150 + c243762 commit cf2651a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/compilation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
container: ps2dev/ps2sdk:latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install dependencies
run: |
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
DISPATCH_TOKEN: ${{ secrets.DISPATCH_TOKEN }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Extract DOCKER_TAG using tag name
if: startsWith(github.ref, 'refs/tags/')
Expand All @@ -32,13 +32,13 @@ jobs:
- name: Login to DockerHub
if: env.DOCKER_USERNAME != null
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Login to Github Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand All @@ -55,7 +55,7 @@ jobs:
echo "DOCKER_TAG_LIST=ghcr.io/${{ github.repository }}:${{ env.DOCKER_TAG }}" >> $GITHUB_ENV
- name: Build and Push to container registry
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
push: true
tags: ${{ env.DOCKER_TAG_LIST }}
Expand All @@ -68,7 +68,7 @@ jobs:
echo "NEW_DISPATCH_ACTION=$DISPATCH_ACTION" >> $GITHUB_ENV
- name: Repository Dispatch to ps2dev
uses: peter-evans/repository-dispatch@v2
uses: peter-evans/repository-dispatch@v3
if: env.DISPATCH_TOKEN != null
with:
repository: ${{ github.repository_owner }}/ps2dev
Expand All @@ -77,7 +77,7 @@ jobs:
client-payload: '{"ref": "${{ github.ref }}"}'

- name: Repository Dispatch to gsKit
uses: peter-evans/repository-dispatch@v2
uses: peter-evans/repository-dispatch@v3
if: env.DISPATCH_TOKEN != null
with:
repository: ${{ github.repository_owner }}/gsKit
Expand Down
2 changes: 1 addition & 1 deletion build-cmakelibs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ git clone https://github.com/sezero/mikmod.git mikmod-mikmod || { exit 1; }
git clone --depth 1 -b feature/cmake https://github.com/mcmtroffaes/theora.git || { exit 1; }

# SDL requires to have gsKit
git clone --depth 1 -b v1.3.6 https://github.com/ps2dev/gsKit || { exit 1; }
git clone --depth 1 -b v1.3.7 https://github.com/ps2dev/gsKit || { exit 1; }

# We need to clone the whole repo and point to the specific hash for now,
# till a new version is released after this commit
Expand Down

0 comments on commit cf2651a

Please sign in to comment.