Skip to content

Commit

Permalink
Merge pull request #15 from fjtrujy/update_ci
Browse files Browse the repository at this point in the history
Updating CI
  • Loading branch information
fjtrujy authored Mar 27, 2024
2 parents f3192ca + cc296bb commit 49da578
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/compilation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
shell: ${{ matrix.os[1] }} {0}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -28,14 +28,12 @@ jobs:
run: |
sudo apt-get update
sudo apt-get -y install texinfo bison flex gettext libgmp3-dev libmpfr-dev libmpc-dev
echo "MSYSTEM=x64" >> $GITHUB_ENV
- name: Install macOS packages
if: matrix.os[0] == 'macos-latest'
run: |
brew update
brew install texinfo bison flex gnu-sed gsl gmp mpfr libmpc
echo "MSYSTEM=x64" >> $GITHUB_ENV
- name: Install MSYS2 packages
if: matrix.os[0] == 'windows-latest'
Expand All @@ -46,7 +44,6 @@ jobs:
base-devel git make texinfo flex bison patch binutils mingw-w64-i686-gcc mpc-devel tar
mingw-w64-i686-cmake mingw-w64-i686-make mingw-w64-i686-libogg
update: true
shell: msys2 {0}

- name: Runs all the stages in the shell
continue-on-error: false
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
DISPATCH_TOKEN: ${{ secrets.DISPATCH_TOKEN }}

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

- name: Extract DOCKER_TAG using tag name
if: startsWith(github.ref, 'refs/tags/')
Expand All @@ -30,20 +30,20 @@ jobs:
echo "DOCKER_TAG=latest" >> $GITHUB_ENV
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
if: env.DOCKER_USERNAME != null
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Login to Github Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand All @@ -60,7 +60,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@v2
uses: docker/build-push-action@v5
with:
push: true
tags: ${{ env.DOCKER_TAG_LIST }}
Expand All @@ -71,7 +71,7 @@ jobs:
echo "NEW_DISPATCH_ACTION=$DISPATCH_ACTION" >> $GITHUB_ENV
- name: Repository Dispatch
uses: peter-evans/repository-dispatch@v1
uses: peter-evans/repository-dispatch@v3
if: env.DISPATCH_TOKEN != null
with:
repository: ${{ github.repository_owner }}/ps2toolchain
Expand Down

0 comments on commit 49da578

Please sign in to comment.