diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index 453e8c7..6118fee 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -11,19 +11,19 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-latest, ubuntu-latest] + os: [macos-13, ubuntu-22.04, ubuntu-22.04-arm] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install Ubuntu dependencies - if: matrix.os == 'ubuntu-latest' + if: contains(matrix.os, 'ubuntu') run: | sudo apt-get update sudo apt-get -y install texinfo bison flex findutils ninja-build - name: Install Mac dependencies - if: matrix.os == 'macOS-latest' + if: contains(matrix.os, 'macos') run: | brew update brew install texinfo bison flex ninja @@ -42,7 +42,7 @@ jobs: run: | tar -zcvf orbisdev.tar.gz orbisdev - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: orbisdev-${{ steps.slug.outputs.sha8 }}-${{matrix.os}} path: orbisdev.tar.gz @@ -57,9 +57,9 @@ jobs: - name: Release if: startsWith(github.ref, 'refs/tags/') - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: orbisdev-${{matrix.os}}.tar.gz tag_name: ${{ steps.tag.outputs.VERSION }} env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 89d345f..31d9353 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -10,12 +10,17 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Extract DOCKER_TAG using tag name if: startsWith(github.ref, 'refs/tags/') run: | echo "DOCKER_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV + + - name: Extract REPO_NAME + run: | + REPO_NAME=$(echo "$GITHUB_REPOSITORY" | cut -d'/' -f2) + echo "GITHUB_REPOSITORY_NAME=$REPO_NAME" >> $GITHUB_ENV - name: Use default DOCKER_TAG if: startsWith(github.ref, 'refs/tags/') != true @@ -23,21 +28,22 @@ 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 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - uses: docker/build-push-action@v2 + - uses: docker/build-push-action@v4 with: push: true tags: ${{ github.repository }}:${{ env.DOCKER_TAG }} +# tags: ${{ vars.DOCKER_USERNAME }}/${{ env.GITHUB_REPOSITORY_NAME }}:${{ env.DOCKER_TAG }} - name: Send Compile action run: | @@ -45,9 +51,9 @@ jobs: echo "NEW_DISPATCH_ACTION=$DISPATCH_ACTION" >> $GITHUB_ENV - name: Repository Dispatch - uses: peter-evans/repository-dispatch@v1 + uses: peter-evans/repository-dispatch@v3 with: repository: ${{ github.repository_owner }}/orbisdev-sdkvanilla token: ${{ secrets.DISPATCH_TOKEN }} event-type: ${{ env.NEW_DISPATCH_ACTION }} - client-payload: '{"ref": "${{ github.ref }}"}' \ No newline at end of file + client-payload: '{"ref": "${{ github.ref }}"}' diff --git a/Dockerfile b/Dockerfile index 8807b4d..004d7fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # First stage of Dockerfile -FROM alpine:latest +FROM alpine:3.13 ENV ORBISDEV /usr/local/orbisdev ENV PATH $ORBISDEV/bin:$PATH @@ -11,7 +11,7 @@ RUN apk add build-base git bash patch wget texinfo ninja bison flex cmake python RUN cd /src && ./toolchain.sh # Second stage of Dockerfile -FROM alpine:latest +FROM alpine:3.13 ENV ORBISDEV /usr/local/orbisdev ENV PATH $ORBISDEV/bin:$PATH diff --git a/README.md b/README.md index 393f67e..0b3c6ab 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ +[![CI](https://github.com/humbertodias/orbisdev-toolchain/actions/workflows/compilation.yml/badge.svg)](https://github.com/humbertodias/orbisdev-toolchain/actions/workflows/compilation.yml) +[![CI-Docker](https://github.com/humbertodias/orbisdev-toolchain/actions/workflows/docker.yml/badge.svg)](https://github.com/humbertodias/orbisdev-toolchain/actions/workflows/docker.yml) # orbisdev-toolchain clang and binutils for PlayStation 4