From f081ad6b371e1c45ecf83f6bbc6d7e79d7808584 Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Sun, 18 May 2025 21:35:07 -0300 Subject: [PATCH 01/27] Update compilation.yml --- .github/workflows/compilation.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index 453e8c7..68225a5 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -5,6 +5,7 @@ on: pull_request: repository_dispatch: types: [run_build, run_release] + workflow_dispatch: # Allows manual triggering jobs: build: @@ -62,4 +63,4 @@ jobs: 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 }} From 4f4bfc46577e90fab5eef60ffda460c24ce81552 Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Sun, 18 May 2025 21:36:44 -0300 Subject: [PATCH 02/27] @v2 --- .github/workflows/compilation.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index 68225a5..d13bc05 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -15,7 +15,7 @@ jobs: os: [macos-latest, ubuntu-latest] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install Ubuntu dependencies if: matrix.os == 'ubuntu-latest' @@ -43,7 +43,7 @@ jobs: run: | tar -zcvf orbisdev.tar.gz orbisdev - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: orbisdev-${{ steps.slug.outputs.sha8 }}-${{matrix.os}} path: orbisdev.tar.gz @@ -58,7 +58,7 @@ 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 }} From 35dc449dd3b692aab258ddc6b6867e56d1c45fa1 Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Sun, 18 May 2025 21:38:15 -0300 Subject: [PATCH 03/27] Update compilation.yml --- .github/workflows/compilation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index d13bc05..feda3fc 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -15,7 +15,7 @@ jobs: os: [macos-latest, ubuntu-latest] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Ubuntu dependencies if: matrix.os == 'ubuntu-latest' @@ -43,7 +43,7 @@ jobs: run: | tar -zcvf orbisdev.tar.gz orbisdev - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: orbisdev-${{ steps.slug.outputs.sha8 }}-${{matrix.os}} path: orbisdev.tar.gz From 113e359533641fec99b9d1d74c8f3f118cceb4fc Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Sun, 18 May 2025 21:40:45 -0300 Subject: [PATCH 04/27] Update docker.yml --- .github/workflows/docker.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 89d345f..b1302fb 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -10,7 +10,7 @@ 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/') @@ -23,18 +23,18 @@ 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 }} @@ -45,9 +45,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 }}"}' From 86b1e58481d8c313ebbb9a3ff5176fd3ea75fe4a Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Sun, 18 May 2025 21:44:10 -0300 Subject: [PATCH 05/27] Update compilation.yml --- .github/workflows/compilation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index feda3fc..abdcbb5 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -27,7 +27,7 @@ jobs: if: matrix.os == 'macOS-latest' run: | brew update - brew install texinfo bison flex ninja + brew install texinfo bison flex ninja gmp - name: Runs all the stages in the shell run: | From ddef2817fcd50c0720e525655665d8326f62692c Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Sun, 18 May 2025 21:49:05 -0300 Subject: [PATCH 06/27] Update compilation.yml --- .github/workflows/compilation.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index abdcbb5..81ac5bf 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -12,7 +12,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-latest, ubuntu-latest] +# os: [macos-latest, ubuntu-latest] + os: [ubuntu-latest] steps: - uses: actions/checkout@v4 @@ -27,7 +28,7 @@ jobs: if: matrix.os == 'macOS-latest' run: | brew update - brew install texinfo bison flex ninja gmp + brew install texinfo bison flex ninja - name: Runs all the stages in the shell run: | From c8ee4805bfece2aead89e58033402d6da0322dd8 Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Sun, 18 May 2025 22:01:47 -0300 Subject: [PATCH 07/27] Update stage1-clang.sh --- stage1-clang.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage1-clang.sh b/stage1-clang.sh index 38a5330..3eb1167 100644 --- a/stage1-clang.sh +++ b/stage1-clang.sh @@ -5,7 +5,7 @@ PROC_NR=$(getconf _NPROCESSORS_ONLN) REPO_URL="https://github.com/llvm/llvm-project" REPO_FOLDER="llvm-project" -BRANCH_NAME="llvmorg-14.0.3" +BRANCH_NAME="llvmorg-20.1.5" if test ! -d "$REPO_FOLDER"; then git clone --depth 1 -b $BRANCH_NAME $REPO_URL && cd $REPO_FOLDER || exit 1 else From b32928a43463071788461c3c5766ee7ca62565c3 Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Sun, 18 May 2025 22:02:49 -0300 Subject: [PATCH 08/27] Update stage0-binutils.sh --- stage0-binutils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage0-binutils.sh b/stage0-binutils.sh index a1977ca..3634793 100755 --- a/stage0-binutils.sh +++ b/stage0-binutils.sh @@ -6,7 +6,7 @@ PROC_NR=$(getconf _NPROCESSORS_ONLN) ## Download the source code. REPO_URL="https://github.com/bminor/binutils-gdb" REPO_FOLDER="binutils-gdb" -BRANCH_NAME="binutils-2_38" +BRANCH_NAME="binutils-2_44" if test ! -d "$REPO_FOLDER"; then git clone --depth 1 -b $BRANCH_NAME $REPO_URL && cd $REPO_FOLDER || exit 1 else From 34bfbb7944c3798774dc19971f3c7084109ef3f2 Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Sun, 18 May 2025 22:23:45 -0300 Subject: [PATCH 09/27] Update stage0-binutils.sh --- stage0-binutils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage0-binutils.sh b/stage0-binutils.sh index 3634793..a1977ca 100755 --- a/stage0-binutils.sh +++ b/stage0-binutils.sh @@ -6,7 +6,7 @@ PROC_NR=$(getconf _NPROCESSORS_ONLN) ## Download the source code. REPO_URL="https://github.com/bminor/binutils-gdb" REPO_FOLDER="binutils-gdb" -BRANCH_NAME="binutils-2_44" +BRANCH_NAME="binutils-2_38" if test ! -d "$REPO_FOLDER"; then git clone --depth 1 -b $BRANCH_NAME $REPO_URL && cd $REPO_FOLDER || exit 1 else From 066574b57ab24a069f34e68fd31025003688146e Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Sun, 18 May 2025 22:28:21 -0300 Subject: [PATCH 10/27] Update compilation.yml --- .github/workflows/compilation.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index 81ac5bf..7bd6486 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -5,15 +5,13 @@ on: pull_request: repository_dispatch: types: [run_build, run_release] - workflow_dispatch: # Allows manual triggering jobs: build: runs-on: ${{ matrix.os }} strategy: matrix: -# os: [macos-latest, ubuntu-latest] - os: [ubuntu-latest] + os: [macos-latest, ubuntu-latest] steps: - uses: actions/checkout@v4 From 784e0e5cd9d65f04013b17591eb4a305cc2f10d3 Mon Sep 17 00:00:00 2001 From: Humberto Date: Sun, 18 May 2025 23:47:42 -0300 Subject: [PATCH 11/27] alpine:3.13 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 8ec036680cb0bb383777bb32d24b11a10c71d84e Mon Sep 17 00:00:00 2001 From: Humberto Date: Sun, 18 May 2025 23:47:55 -0300 Subject: [PATCH 12/27] llvmorg-14.0.3 --- stage1-clang.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage1-clang.sh b/stage1-clang.sh index 3eb1167..38a5330 100644 --- a/stage1-clang.sh +++ b/stage1-clang.sh @@ -5,7 +5,7 @@ PROC_NR=$(getconf _NPROCESSORS_ONLN) REPO_URL="https://github.com/llvm/llvm-project" REPO_FOLDER="llvm-project" -BRANCH_NAME="llvmorg-20.1.5" +BRANCH_NAME="llvmorg-14.0.3" if test ! -d "$REPO_FOLDER"; then git clone --depth 1 -b $BRANCH_NAME $REPO_URL && cd $REPO_FOLDER || exit 1 else From 318fc6792269b8774a052c108c8df3c64a788d52 Mon Sep 17 00:00:00 2001 From: Humberto Date: Sun, 18 May 2025 23:48:06 -0300 Subject: [PATCH 13/27] ubuntu-20.04 --- .github/workflows/compilation.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index 7bd6486..10ab8f8 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -11,13 +11,14 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-latest, ubuntu-latest] +# os: [macos-latest, ubuntu-latest] + os: [ubuntu-20.04] steps: - uses: actions/checkout@v4 - name: Install Ubuntu dependencies - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-20.04' run: | sudo apt-get update sudo apt-get -y install texinfo bison flex findutils ninja-build From 0af66df768790b1b53b2ff5331a3b7748724dc85 Mon Sep 17 00:00:00 2001 From: Humberto Date: Sun, 18 May 2025 23:49:24 -0300 Subject: [PATCH 14/27] ubuntu-22.04 --- .github/workflows/compilation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index 10ab8f8..65dee9b 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -12,13 +12,13 @@ jobs: strategy: matrix: # os: [macos-latest, ubuntu-latest] - os: [ubuntu-20.04] + os: [ubuntu-22.04] steps: - uses: actions/checkout@v4 - name: Install Ubuntu dependencies - if: matrix.os == 'ubuntu-20.04' + if: matrix.os == 'ubuntu-22.04' run: | sudo apt-get update sudo apt-get -y install texinfo bison flex findutils ninja-build From 03aef4568db70c0e47f1e56bba1593facc6a0343 Mon Sep 17 00:00:00 2001 From: Humberto Date: Mon, 19 May 2025 00:07:57 -0300 Subject: [PATCH 15/27] macos-11 --- .github/workflows/compilation.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index 65dee9b..26939ad 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -12,19 +12,19 @@ jobs: strategy: matrix: # os: [macos-latest, ubuntu-latest] - os: [ubuntu-22.04] + os: [macos-11, ubuntu-22.04] steps: - uses: actions/checkout@v4 - name: Install Ubuntu dependencies - if: matrix.os == 'ubuntu-22.04' + 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 From 505f0af2a74699394ffb4d8c5eea00b38ff140b9 Mon Sep 17 00:00:00 2001 From: Humberto Date: Mon, 19 May 2025 00:09:29 -0300 Subject: [PATCH 16/27] macos-12 --- .github/workflows/compilation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index 26939ad..e414fb4 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: # os: [macos-latest, ubuntu-latest] - os: [macos-11, ubuntu-22.04] + os: [macos-12, ubuntu-22.04] steps: - uses: actions/checkout@v4 From 48dfac92111098289cad5e0358c5e0fe54a4aba2 Mon Sep 17 00:00:00 2001 From: Humberto Date: Mon, 19 May 2025 00:11:01 -0300 Subject: [PATCH 17/27] macos-13 --- .github/workflows/compilation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index e414fb4..43714eb 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: # os: [macos-latest, ubuntu-latest] - os: [macos-12, ubuntu-22.04] + os: [macos-13, ubuntu-22.04] steps: - uses: actions/checkout@v4 From f7ed9de630f82405dc8b7a10f44f035a17195e4b Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Mon, 19 May 2025 00:49:24 -0300 Subject: [PATCH 18/27] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 393f67e..ac72fea 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) + # orbisdev-toolchain clang and binutils for PlayStation 4 From af21088e583aa67da5b7dbd98afe9b03c710ec27 Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Mon, 19 May 2025 00:57:47 -0300 Subject: [PATCH 19/27] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ac72fea..0b3c6ab 100644 --- a/README.md +++ b/README.md @@ -1,4 +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 From 4a6cc76a026acaf863bc6681348c3d744529af18 Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Mon, 19 May 2025 01:26:11 -0300 Subject: [PATCH 20/27] Update compilation.yml --- .github/workflows/compilation.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index 43714eb..d9e6c60 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -11,7 +11,6 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: -# os: [macos-latest, ubuntu-latest] os: [macos-13, ubuntu-22.04] steps: From 95d6ea2ad33aa72df931c6e98a246113f0a85b0c Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Mon, 19 May 2025 09:47:46 -0300 Subject: [PATCH 21/27] add ubuntu-22.04-arm --- .github/workflows/compilation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index d9e6c60..6118fee 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-13, ubuntu-22.04] + os: [macos-13, ubuntu-22.04, ubuntu-22.04-arm] steps: - uses: actions/checkout@v4 From 3a9ac7c176ce1c45f851234a1eba8d96f475b4d5 Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Mon, 19 May 2025 12:46:51 -0300 Subject: [PATCH 22/27] Update docker.yml --- .github/workflows/docker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b1302fb..29dab6d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -37,7 +37,8 @@ jobs: - uses: docker/build-push-action@v4 with: push: true - tags: ${{ github.repository }}:${{ env.DOCKER_TAG }} +# tags: ${{ github.repository }}:${{ env.DOCKER_TAG }} + tags: ${{ secrets.DOCKER_USERNAME }}/${{ github.repository_name }}:${{ env.DOCKER_TAG }} - name: Send Compile action run: | From 7164244afa3e6e05c62d38250ddf0f01bd8f7afa Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Mon, 19 May 2025 13:39:00 -0300 Subject: [PATCH 23/27] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 29dab6d..9e0d00c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -38,7 +38,7 @@ jobs: with: push: true # tags: ${{ github.repository }}:${{ env.DOCKER_TAG }} - tags: ${{ secrets.DOCKER_USERNAME }}/${{ github.repository_name }}:${{ env.DOCKER_TAG }} + tags: ${{ env.DOCKER_USERNAME }}/${{ github.repository_name }}:${{ env.DOCKER_TAG }} - name: Send Compile action run: | From d3d22eb1c5160469abc538ca54d42d0ac6b6ef4b Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Mon, 19 May 2025 13:40:02 -0300 Subject: [PATCH 24/27] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 9e0d00c..2c08bba 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -31,7 +31,7 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKER_USERNAME }} + username: ${{ env.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - uses: docker/build-push-action@v4 From fcf9805fc6fc8aee75ef2c5a2efed4436c129fd0 Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Mon, 19 May 2025 13:50:21 -0300 Subject: [PATCH 25/27] Update docker.yml --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2c08bba..c699061 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -31,14 +31,14 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v3 with: - username: ${{ env.DOCKER_USERNAME }} + username: ${{ vars.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - uses: docker/build-push-action@v4 with: push: true # tags: ${{ github.repository }}:${{ env.DOCKER_TAG }} - tags: ${{ env.DOCKER_USERNAME }}/${{ github.repository_name }}:${{ env.DOCKER_TAG }} + tags: ${{ vars.DOCKER_USERNAME }}/${{ github.repository_name }}:${{ env.DOCKER_TAG }} - name: Send Compile action run: | From 2de5de3f242df82d64c68c6c2f1bfc944c85095f Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Mon, 19 May 2025 13:55:14 -0300 Subject: [PATCH 26/27] Update docker.yml --- .github/workflows/docker.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c699061..ed7a5dd 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -16,6 +16,11 @@ jobs: 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 @@ -38,7 +43,7 @@ jobs: with: push: true # tags: ${{ github.repository }}:${{ env.DOCKER_TAG }} - tags: ${{ vars.DOCKER_USERNAME }}/${{ github.repository_name }}:${{ env.DOCKER_TAG }} + tags: ${{ vars.DOCKER_USERNAME }}/${{ env.GITHUB_REPOSITORY_NAME }}:${{ env.DOCKER_TAG }} - name: Send Compile action run: | From 5c3ecff90a584336771b0a42dba925d4c8831264 Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Mon, 19 May 2025 15:53:35 -0300 Subject: [PATCH 27/27] Update docker.yml --- .github/workflows/docker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ed7a5dd..31d9353 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -36,14 +36,14 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v3 with: - username: ${{ vars.DOCKER_USERNAME }} + username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - 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 }} + tags: ${{ github.repository }}:${{ env.DOCKER_TAG }} +# tags: ${{ vars.DOCKER_USERNAME }}/${{ env.GITHUB_REPOSITORY_NAME }}:${{ env.DOCKER_TAG }} - name: Send Compile action run: |