GHActions: Cache patchelf

This commit is contained in:
TellowKrinkle 2021-11-30 23:03:52 -06:00 committed by tellowkrinkle
parent 3d0654dd48
commit d97e867c07
2 changed files with 15 additions and 11 deletions

View File

@ -93,6 +93,7 @@ jobs:
CCACHE_COMPRESSLEVEL: 9 CCACHE_COMPRESSLEVEL: 9
CCACHE_MAXSIZE: 100M CCACHE_MAXSIZE: 100M
SDL: SDL2-2.0.16 SDL: SDL2-2.0.16
PATCHELF_VERSION: 0.12
steps: steps:
# NOTE - useful for debugging # NOTE - useful for debugging
@ -158,14 +159,24 @@ jobs:
COMPILER: ${{ matrix.compiler }} COMPILER: ${{ matrix.compiler }}
run: .github/workflows/scripts/linux/install-packages.sh run: .github/workflows/scripts/linux/install-packages.sh
- name: Cache SDL2 - name: Cache Dependencies
uses: actions/cache@v2.1.7 uses: actions/cache@v2.1.7
with: with:
path: 3rdparty/${{ env.SDL }} path: |
key: ${{ matrix.os }} ${{ matrix.platform }} ${{ env.SDL }} 3rdparty/${{ env.SDL }}
3rdparty/patchelf-${{ env.PATCHELF_VERSION }}
key: ${{ matrix.os }} ${{ matrix.platform }} ${{ env.SDL }} patchelf-${{ env.PATCHELF_VERSION }}
- name: Build SDL2 - name: Build Dependencies
run: | run: |
if [[ ! -e 3rdparty/patchelf-${{ env.PATCHELF_VERSION }} ]]; then
curl -sSfL https://github.com/NixOS/patchelf/releases/download/${{ env.PATCHELF_VERSION }}/patchelf-${{ env.PATCHELF_VERSION }}.tar.bz2 | tar -xjC 3rdparty
mv 3rdparty/patchelf-${{ env.PATCHELF_VERSION }}* 3rdparty/patchelf-${{ env.PATCHELF_VERSION }}
cd 3rdparty/patchelf-${{ env.PATCHELF_VERSION }}
./configure
make && cd ../../
fi
sudo make -C 3rdparty/patchelf-${{ env.PATCHELF_VERSION }} install
if [[ ! -e 3rdparty/${{ env.SDL }} ]]; then if [[ ! -e 3rdparty/${{ env.SDL }} ]]; then
curl -sL https://libsdl.org/release/${{ env.SDL }}.tar.gz | tar -xzC 3rdparty curl -sL https://libsdl.org/release/${{ env.SDL }}.tar.gz | tar -xzC 3rdparty
cd 3rdparty/${{ env.SDL }} cd 3rdparty/${{ env.SDL }}

View File

@ -61,10 +61,3 @@ sudo apt-get -y install "${BUILD_PACKAGES[@]}"
PCSX2_PACKAGES=("${PCSX2_PACKAGES[@]/%/"${ARCH}"}") PCSX2_PACKAGES=("${PCSX2_PACKAGES[@]/%/"${ARCH}"}")
echo "Will install the following packages for pcsx2 - ${PCSX2_PACKAGES[*]}" echo "Will install the following packages for pcsx2 - ${PCSX2_PACKAGES[*]}"
sudo apt-get -y install "${PCSX2_PACKAGES[@]}" sudo apt-get -y install "${PCSX2_PACKAGES[@]}"
cd /tmp
curl -sSfLO https://github.com/NixOS/patchelf/releases/download/0.12/patchelf-0.12.tar.bz2
tar xvf patchelf-0.12.tar.bz2
cd patchelf-0.12*/
./configure
make && sudo make install