From 9d3a7a698b1f5e01bc64cca0cb4c0c3dddd917e8 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 5 Dec 2023 19:16:21 +0100 Subject: [PATCH] rework CI deps Signed-off-by: falkTX --- .github/workflows/build.yml | 77 +++++++++++++++++-------------------- src/PawPaw | 2 +- 2 files changed, 36 insertions(+), 43 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b83b6a6..c7ee96a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,18 +3,16 @@ name: build on: [push, pull_request] env: - CACHE_VERSION_LINUX: 12 - CACHE_VERSION_MACOS: 11 - CACHE_VERSION_WIN64: 12 - PAWPAW_SKIP_LTO: 1 + CACHE_VERSION_LINUX: 1 + CACHE_VERSION_MACOS: 1 + CACHE_VERSION_WIN64: 1 jobs: linux-x86_64: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest + container: + image: ubuntu-22.04 steps: - - uses: actions/checkout@v3 - with: - submodules: recursive - name: Set up cache id: cache uses: actions/cache@v3 @@ -22,28 +20,29 @@ jobs: path: | ~/PawPawBuilds key: linux-x86_64-v${{ env.CACHE_VERSION_LINUX }} - - name: Set sha8 - run: | - echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV - name: Set up dependencies run: | - sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades gperf libasound2-dev libdbus-1-dev libgl1-mesa-dev libglib2.0-dev libpcre3-dev libqt5svg5-dev libxcb1-dev libxcursor-dev libxext-dev libxfixes-dev libxrandr-dev libxrender-dev meson qtbase5-dev qtbase5-dev-tools uuid-dev xdg-user-dirs + ./src/PawPaw/.github/workflows/bootstrap-deps.sh linux-x86_64 + sudo apt-get install -yqq libqt5svg5-dev qtbase5-dev qtbase5-dev-tools xdg-user-dirs + - uses: actions/checkout@v3 + with: + submodules: recursive - name: Build dependencies run: | ./src/PawPaw/bootstrap-mod.sh linux-x86_64 && ./src/PawPaw/.cleanup.sh linux-x86_64 - name: Build if: steps.cache.outputs.cache-hit == 'true' run: | - make PAWPAW_TARGET=linux-x86_64 - # FIXME needs to run twice for now - make PAWPAW_TARGET=linux-x86_64 + make - name: Validate plugins if: steps.cache.outputs.cache-hit == 'true' run: | ./utils/plugin-builder/validate-plugins.sh # FIXME dirty carla leaves temp folders around rm -rf *.tmp + - name: Set sha8 + run: | + echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV - name: Pack if: steps.cache.outputs.cache-hit == 'true' run: | @@ -69,9 +68,6 @@ jobs: macos: runs-on: macos-11 steps: - - uses: actions/checkout@v3 - with: - submodules: recursive - name: Set up cache id: cache uses: actions/cache@v3 @@ -79,27 +75,28 @@ jobs: path: | ~/PawPawBuilds key: macos-v${{ env.CACHE_VERSION_MACOS }} - - name: Set sha8 - run: | - echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV - name: Set up dependencies run: | - brew install autoconf automake cmake coreutils gawk gnu-sed make meson + ./src/PawPaw/.github/workflows/bootstrap-deps.sh macos-universal-10.15 + - uses: actions/checkout@v3 + with: + submodules: recursive - name: Build dependencies run: | ./src/PawPaw/bootstrap-mod.sh macos-universal-10.15 && ./src/PawPaw/.cleanup.sh macos-universal-10.15 - name: Build if: steps.cache.outputs.cache-hit == 'true' run: | - make PAWPAW_TARGET=macos-universal-10.15 - # FIXME needs to run twice for now - make PAWPAW_TARGET=macos-universal-10.15 + make macos - name: Validate plugins if: steps.cache.outputs.cache-hit == 'true' run: | ./utils/plugin-builder/validate-plugins.sh # FIXME dirty carla leaves temp folders around rm -rf *.tmp + - name: Set sha8 + run: | + echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV - name: Pack if: steps.cache.outputs.cache-hit == 'true' run: | @@ -121,11 +118,10 @@ jobs: *.dmg win64: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest + container: + image: ubuntu-22.04 steps: - - uses: actions/checkout@v3 - with: - submodules: recursive - name: Set up cache id: cache uses: actions/cache@v3 @@ -133,32 +129,29 @@ jobs: path: | ~/PawPawBuilds key: win64-v${{ env.CACHE_VERSION_WIN64 }} - - name: Set sha8 - run: | - echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV - - name: Fix GitHub's mess - run: | - sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list - sudo dpkg --add-architecture i386 - sudo apt-get update -qq - name: Set up dependencies run: | - sudo apt-get install -yqq --allow-downgrades autopoint binutils-mingw-w64-x86-64 libc6:i386 libgcc-s1:i386 libstdc++6:i386 g++-mingw-w64-x86-64 gperf meson mingw-w64 wine-stable xdg-user-dirs xvfb + ./src/PawPaw/.github/workflows/bootstrap-deps.sh win64 + sudo apt-get install -yqq xdg-user-dirs xvfb + - uses: actions/checkout@v3 + with: + submodules: recursive - name: Build dependencies run: | ./src/PawPaw/bootstrap-mod.sh win64 && ./src/PawPaw/.cleanup.sh win64 - name: Build if: steps.cache.outputs.cache-hit == 'true' run: | - make PAWPAW_TARGET=win64 - # FIXME needs to run twice for now - make PAWPAW_TARGET=win64 + make win64 - name: Validate plugins if: steps.cache.outputs.cache-hit == 'true' run: | ./utils/plugin-builder/validate-plugins.sh # FIXME dirty carla leaves temp folders around rm -rf *.tmp + - name: Set sha8 + run: | + echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV - name: Pack if: steps.cache.outputs.cache-hit == 'true' run: | diff --git a/src/PawPaw b/src/PawPaw index b7f9993..907a25a 160000 --- a/src/PawPaw +++ b/src/PawPaw @@ -1 +1 @@ -Subproject commit b7f99932efa534faac561a99b06950ff309e4da5 +Subproject commit 907a25a754df57e13fdca448e13e63051cc5943e