From ea6652b87896fbe5c5d3746dadffe13a2e901432 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 31 Dec 2021 23:08:01 +0000 Subject: [PATCH] Give up on ccache setup; Just cache the whole build dir instead --- .github/workflows/build.yml | 98 ++++++++----------------------------- 1 file changed, 21 insertions(+), 77 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e9d21a..380f332 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,14 +20,12 @@ jobs: - uses: actions/checkout@v2 with: submodules: recursive - - name: Set up ccache + - name: Set up cache uses: actions/cache@v2 with: path: | - ~/.ccache - ~/PawPawBuilds/builds - ~/PawPawBuilds/downloads - ~/PawPawBuilds/targets + ~/PawPawBuilds + ~/work/Cardinal/Cardinal/build key: linux-arm64-v${{ env.CACHE_VERSION }} - name: Set up dependencies run: | @@ -38,19 +36,13 @@ jobs: echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list sudo apt-get update -qq sudo apt-get install -yqq g++-aarch64-linux-gnu libdbus-1-dev:arm64 libgl1-mesa-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 qemu-user-static - - name: Install ccache - run: | - sudo apt-get install -yqq ccache - ccache --set-config=compression=true - name: Build extra dependencies env: PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig run: | - export PATH="/usr/lib/ccache:${PATH}" ./deps/PawPaw/bootstrap-cardinal.sh linux-aarch64 - name: Build linux arm64 cross-compiled run: | - export PATH="/usr/lib/ccache:${PATH}" pushd deps/PawPaw; source local.env linux-aarch64; popd make features make NOOPT=true SKIP_RTAUDIO_FALLBACK=true WITH_LTO=true WITH_PAWPAW=true -j $(nproc) @@ -73,14 +65,12 @@ jobs: - uses: actions/checkout@v2 with: submodules: recursive - - name: Set up ccache + - name: Set up cache uses: actions/cache@v2 with: path: | - ~/.ccache - ~/PawPawBuilds/builds - ~/PawPawBuilds/downloads - ~/PawPawBuilds/targets + ~/PawPawBuilds + ~/work/Cardinal/Cardinal/build key: linux-armhf-v${{ env.CACHE_VERSION }} - name: Set up dependencies run: | @@ -91,19 +81,13 @@ jobs: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list sudo apt-get update -qq sudo apt-get install -yqq g++-arm-linux-gnueabihf libdbus-1-dev:armhf libgl1-mesa-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf qemu-user-static - - name: Install ccache - run: | - sudo apt-get install -yqq ccache - ccache --set-config=compression=true - name: Build extra dependencies env: PKG_CONFIG_PATH: /usr/lib/arm-linux-gnueabihf/pkgconfig run: | - export PATH="/usr/lib/ccache:${PATH}" ./deps/PawPaw/bootstrap-cardinal.sh linux-armhf - name: Build linux armhf cross-compiled run: | - export PATH="/usr/lib/ccache:${PATH}" pushd deps/PawPaw; source local.env linux-armhf; popd make features make NOOPT=true SKIP_RTAUDIO_FALLBACK=true WITH_LTO=true WITH_PAWPAW=true -j $(nproc) @@ -126,33 +110,25 @@ jobs: - uses: actions/checkout@v2 with: submodules: recursive - - name: Set up ccache + - name: Set up cache uses: actions/cache@v2 with: path: | - ~/.ccache - ~/PawPawBuilds/builds - ~/PawPawBuilds/downloads - ~/PawPawBuilds/targets + ~/PawPawBuilds + ~/work/Cardinal/Cardinal/build key: linux-i686-v${{ env.CACHE_VERSION }} - name: Set up dependencies run: | sudo dpkg --add-architecture i386 sudo apt-get update -qq sudo apt-get install -yqq g++-multilib libdbus-1-dev:i386 libgl1-mesa-dev:i386 libx11-dev:i386 libxcursor-dev:i386 libxext-dev:i386 libxrandr-dev:i386 - - name: Install ccache - run: | - sudo apt-get install -yqq ccache - ccache --set-config=compression=true - name: Build extra dependencies env: PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig run: | - export PATH="/usr/lib/ccache:${PATH}" ./deps/PawPaw/bootstrap-cardinal.sh linux-i686 - name: Build linux i686 run: | - export PATH="/usr/lib/ccache:${PATH}" pushd deps/PawPaw; source local.env linux-i686; popd make features make NOOPT=true SKIP_RTAUDIO_FALLBACK=true WITH_LTO=true WITH_PAWPAW=true -j $(nproc) @@ -175,30 +151,22 @@ jobs: - uses: actions/checkout@v2 with: submodules: recursive - - name: Set up ccache + - name: Set up cache uses: actions/cache@v2 with: path: | - ~/.ccache - ~/PawPawBuilds/builds - ~/PawPawBuilds/downloads - ~/PawPawBuilds/targets + ~/PawPawBuilds + ~/work/Cardinal/Cardinal/build key: linux-x86_64-v${{ env.CACHE_VERSION }} - name: Set up dependencies run: | sudo apt-get update -qq sudo apt-get install -yqq libdbus-1-dev libgl1-mesa-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev - - name: Install ccache - run: | - sudo apt-get install -yqq ccache - ccache --set-config=compression=true - name: Build extra dependencies run: | - export PATH="/usr/lib/ccache:${PATH}" ./deps/PawPaw/bootstrap-cardinal.sh linux - name: Build linux x86_64 run: | - export PATH="/usr/lib/ccache:${PATH}" pushd deps/PawPaw; source local.env linux; popd make features make NOOPT=true SKIP_RTAUDIO_FALLBACK=true WITH_LTO=true WITH_PAWPAW=true -j $(nproc) @@ -279,30 +247,22 @@ jobs: - uses: actions/checkout@v2 with: submodules: recursive - - name: Set up ccache + - name: Set up cache uses: actions/cache@v2 with: path: | - ~/.ccache - ~/PawPawBuilds/builds - ~/PawPawBuilds/downloads - ~/PawPawBuilds/targets + ~/PawPawBuilds + ~/work/Cardinal/Cardinal/build key: macos-universal-v${{ env.CACHE_VERSION }} - - name: Install ccache - run: | - brew install ccache - ccache --set-config=compression=true - name: Fix up Xcode run: | sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/* sudo xcode-select -s "/Applications/Xcode_12.3.app" - name: Build extra dependencies run: | - export PATH="/usr/local/opt/ccache/libexec:${PATH}" ./deps/PawPaw/bootstrap-cardinal.sh macos-universal - name: Build macOS universal run: | - export PATH="/usr/local/opt/ccache/libexec:${PATH}" pushd deps/PawPaw; source local.env macos-universal; popd make features make NOOPT=true WITH_LTO=true WITH_PAWPAW=true -j $(sysctl -n hw.logicalcpu) @@ -322,14 +282,12 @@ jobs: - uses: actions/checkout@v2 with: submodules: recursive - - name: Set up ccache + - name: Set up cache uses: actions/cache@v2 with: path: | - ~/.ccache - ~/PawPawBuilds/builds - ~/PawPawBuilds/downloads - ~/PawPawBuilds/targets + ~/PawPawBuilds + ~/work/Cardinal/Cardinal/build key: win32-v${{ env.CACHE_VERSION }} - name: Set up dependencies run: | @@ -337,17 +295,11 @@ jobs: sudo dpkg --add-architecture i386 sudo apt-get update -qq sudo apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable:i386 - - name: Install ccache - run: | - sudo apt-get install -yqq ccache - ccache --set-config=compression=true - name: Build extra dependencies run: | - export PATH="/usr/lib/ccache:${PATH}" ./deps/PawPaw/bootstrap-cardinal.sh win32 - name: Build win32 cross-compiled run: | - export PATH="/usr/lib/ccache:${PATH}" pushd deps/PawPaw; source local.env win32; popd make features make NOOPT=true WITH_LTO=true WITH_PAWPAW=true -j $(nproc) @@ -369,30 +321,22 @@ jobs: - uses: actions/checkout@v2 with: submodules: recursive - - name: Set up ccache + - name: Set up cache uses: actions/cache@v2 with: path: | - ~/.ccache - ~/PawPawBuilds/builds - ~/PawPawBuilds/downloads - ~/PawPawBuilds/targets + ~/PawPawBuilds + ~/work/Cardinal/Cardinal/build key: win64-v${{ env.CACHE_VERSION }} - name: Set up dependencies run: | sudo apt-get update -qq sudo apt-get install -yqq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable - - name: Install ccache - run: | - sudo apt-get install -yqq ccache - ccache --set-config=compression=true - name: Build extra dependencies run: | - export PATH="/usr/lib/ccache:${PATH}" ./deps/PawPaw/bootstrap-cardinal.sh win64 - name: Build win64 cross-compiled run: | - export PATH="/usr/lib/ccache:${PATH}" pushd deps/PawPaw; source local.env win64; popd make features make NOOPT=true WITH_LTO=true WITH_PAWPAW=true -j $(nproc)