From 5d6000d14fbf4655f116db2b5afcf6ec61fe8346 Mon Sep 17 00:00:00 2001 From: Francisco Javier Trujillo Mata Date: Wed, 14 May 2025 14:10:13 +0200 Subject: [PATCH 1/2] Use GCC 15.1 --- config/ps2toolchain-ee-config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/ps2toolchain-ee-config.sh b/config/ps2toolchain-ee-config.sh index 8e6df2d..1339de0 100644 --- a/config/ps2toolchain-ee-config.sh +++ b/config/ps2toolchain-ee-config.sh @@ -3,9 +3,9 @@ PS2TOOLCHAIN_EE_BINUTILS_REPO_URL="https://github.com/ps2dev/binutils-gdb.git" PS2TOOLCHAIN_EE_BINUTILS_DEFAULT_REPO_REF="ee-v2.44.0" PS2TOOLCHAIN_EE_GCC_REPO_URL="https://github.com/ps2dev/gcc.git" -PS2TOOLCHAIN_EE_GCC_DEFAULT_REPO_REF="ee-v14.2.0" +PS2TOOLCHAIN_EE_GCC_DEFAULT_REPO_REF="ee-v15.1.0" PS2TOOLCHAIN_EE_NEWLIB_REPO_URL="https://github.com/ps2dev/newlib.git" -PS2TOOLCHAIN_EE_NEWLIB_DEFAULT_REPO_REF="ee-v4.5.0" +PS2TOOLCHAIN_EE_NEWLIB_DEFAULT_REPO_REF="ee-v4.5.0-gcc15" PS2TOOLCHAIN_EE_PTHREAD_EMBEDDED_REPO_URL="https://github.com/ps2dev/pthread-embedded.git" PS2TOOLCHAIN_EE_PTHREAD_EMBEDDED_DEFAULT_REPO_REF="platform_agnostic" From 3d1e6933f67cab70b01933e9348d74ef56619142 Mon Sep 17 00:00:00 2001 From: Francisco Javier Trujillo Mata Date: Fri, 16 May 2025 23:30:27 +0200 Subject: [PATCH 2/2] Add ps2dev to workflow --- .github/workflows/compilation.yml | 13 +++++++++++++ config/ps2toolchain-ee-config.sh | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index abcaa4c..ee0028f 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -63,3 +63,16 @@ jobs: mips64r5900el-ps2-elf-as --version mips64r5900el-ps2-elf-ld --version mips64r5900el-ps2-elf-gcc --version + + - name: Get short SHA + id: slug + run: echo "sha8=${MSYSTEM}-sha[$(echo ${GITHUB_SHA} | cut -c1-8)" >> $GITHUB_OUTPUT + + - name: Prepare ps2dev folder + run: | + tar -zcvf ps2dev-${{matrix.os[0]}}.tar.gz ps2dev + + - uses: actions/upload-artifact@v4 + with: + name: ps2dev-${{matrix.os[0]}}-ps2dev-${{matrix.os[1]}}-${{ steps.slug.outputs.sha8 }} + path: ps2dev-${{matrix.os[0]}}.tar.gz diff --git a/config/ps2toolchain-ee-config.sh b/config/ps2toolchain-ee-config.sh index 1339de0..95bd71a 100644 --- a/config/ps2toolchain-ee-config.sh +++ b/config/ps2toolchain-ee-config.sh @@ -5,7 +5,7 @@ PS2TOOLCHAIN_EE_BINUTILS_DEFAULT_REPO_REF="ee-v2.44.0" PS2TOOLCHAIN_EE_GCC_REPO_URL="https://github.com/ps2dev/gcc.git" PS2TOOLCHAIN_EE_GCC_DEFAULT_REPO_REF="ee-v15.1.0" PS2TOOLCHAIN_EE_NEWLIB_REPO_URL="https://github.com/ps2dev/newlib.git" -PS2TOOLCHAIN_EE_NEWLIB_DEFAULT_REPO_REF="ee-v4.5.0-gcc15" +PS2TOOLCHAIN_EE_NEWLIB_DEFAULT_REPO_REF="ee-v4.5.0" PS2TOOLCHAIN_EE_PTHREAD_EMBEDDED_REPO_URL="https://github.com/ps2dev/pthread-embedded.git" PS2TOOLCHAIN_EE_PTHREAD_EMBEDDED_DEFAULT_REPO_REF="platform_agnostic"