diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index a34fb815f..27e1b640f 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -25,22 +25,28 @@ jobs: echo "PS2SDK=${{ github.workspace }}/ps2dev/ps2sdk" >> $GITHUB_ENV echo "GSKIT=${{ github.workspace }}/ps2dev/gsKit" >> $GITHUB_ENV echo "PATH=${{ github.workspace }}/ps2dev/bin:${{ github.workspace }}/ps2dev/ee/bin:${{ github.workspace }}/ps2dev/iop/bin:${{ github.workspace }}/ps2dev/dvp/bin:${{ github.workspace }}/ps2dev/ps2sdk/bin:$PATH" >> $GITHUB_ENV + echo "PS2PACKERSTUBPATH=${{ github.workspace }}/ps2dev/ps2-packer/stub" >> $GITHUB_ENV - name: Create ps2-packer stub directory if it doesn't exist - run: mkdir -p $GITHUB_WORKSPACE/ps2dev/ps2-packer/stub + run: | + mkdir -p $GITHUB_WORKSPACE/ps2dev/ps2-packer/stub - name: List contents of ps2-packer stub directory - run: ls -la $GITHUB_WORKSPACE/ps2dev/share/ps2-packer/stub + run: ls -la $GITHUB_WORKSPACE/ps2dev/ps2-packer/stub - - name: Copy stub files to ps2-packer directory + - name: Verify stub file exists run: | - cp $GITHUB_WORKSPACE/ps2dev/share/ps2-packer/stub/* $GITHUB_WORKSPACE/ps2dev/ps2-packer/stub/ + if [ ! -f $GITHUB_WORKSPACE/ps2dev/ps2-packer/stub/lzma-1d00-stub ]; then + echo "lzma-1d00-stub not found!" + exit 1 + fi - - name: List contents of ps2-packer stub directory - run: ls -la $GITHUB_WORKSPACE/ps2dev/ps2-packer/stub + - name: Copy stub file to ps2-packer directory + run: | + cp $GITHUB_WORKSPACE/ps2dev/ps2-packer/stub/lzma-1d00-stub $GITHUB_WORKSPACE/ps2dev/ps2-packer/stub/ - name: Compile -> make clean release - run: make clean release + run: make --trace clean release - name: Create detailed changelog run: sh ./make_changelog.sh diff --git a/Makefile b/Makefile index 6009616d0..9d02a8319 100644 --- a/Makefile +++ b/Makefile @@ -111,8 +111,6 @@ TRANSLATIONS = Albanian Arabic Bulgarian Cebuano Croatian Czech Danish Dutch Fil German Greek Hungarian Indonesian Italian Japanese Korean Laotian Persian Polish Portuguese \ Portuguese_BR Romana Russian Ryukyuan SChinese Spanish Swedish TChinese Turkish Vietnamese -STUB_PATH := $(GITHUB_WORKSPACE)/ps2dev/ps2-packer/stub - EE_BIN = opl.elf EE_BIN_STRIPPED = opl_stripped.elf EE_BIN_PACKED = OPNPS2LD.ELF @@ -379,7 +377,7 @@ $(EE_BIN_STRIPPED): $(EE_BIN) $(EE_BIN_PACKED): $(EE_BIN_STRIPPED) echo "Compressing..." - ps2-packer $< $@ > /dev/null + ps2-packer -s $(PS2PACKERSTUBPATH)/lzma-1d00-stub opl_stripped.elf OPNPS2LD.ELF > /dev/null $(EE_VPKD).ELF: $(EE_BIN_PACKED) cp -f $< $@