diff --git a/.github/actions/setup-caches/action.yml b/.github/actions/setup-caches/action.yml index efa648e9..d3e59ba1 100644 --- a/.github/actions/setup-caches/action.yml +++ b/.github/actions/setup-caches/action.yml @@ -30,21 +30,40 @@ runs: ################ # vcpkg Cache - - name: Setup vcpkg cache in shell + - name: Setup vcpkg cache in shell (Linux) shell: bash run: | - mkdir -p $HOME/vcpkg_cache - mkdir -p $HOME/vcpkg_download_cache - echo "VCPKG_DEFAULT_BINARY_CACHE=$HOME/vcpkg_cache" >> $GITHUB_ENV - echo "VCPKG_DOWNLOADS=$HOME/vcpkg_download_cache" >> $GITHUB_ENV - if: ${{ runner.os != 'Windows' }} + mkdir -p /home/runner/vcpkg_cache + mkdir -p /home/runner/vcpkg_download_cache + echo "VCPKG_DEFAULT_BINARY_CACHE=/home/runner/vcpkg_cache" >> $GITHUB_ENV + echo "VCPKG_DOWNLOADS=/home/runner/vcpkg_download_cache" >> $GITHUB_ENV + if: ${{ runner.os == 'Linux' }} - - name: Setup vcpkg cache + - name: Setup vcpkg cache (Linux) uses: actions/cache@v4 with: path: | - $HOME/vcpkg_cache - $HOME/vcpkg_download_cache + /home/runner/vcpkg_cache + /home/runner/vcpkg_download_cache key: vcpkg-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('vcpkg.json') }} restore-keys: vcpkg-${{ runner.os }}-${{ runner.arch }}- - if: ${{ runner.os != 'Windows' }} + if: ${{ runner.os == 'Linux' }} + + - name: Setup vcpkg cache in shell (macOS) + shell: bash + run: | + mkdir -p /Users/runner/vcpkg_cache + mkdir -p /Users/runner/vcpkg_download_cache + echo "VCPKG_DEFAULT_BINARY_CACHE=/Users/runner/vcpkg_cache" >> $GITHUB_ENV + echo "VCPKG_DOWNLOADS=/Users/runner/vcpkg_download_cache" >> $GITHUB_ENV + if: ${{ runner.os == 'macOS' }} + + - name: Setup vcpkg cache (macOS) + uses: actions/cache@v4 + with: + path: | + /Users/runner/vcpkg_cache + /Users/runner/vcpkg_download_cache + key: vcpkg-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('vcpkg.json') }} + restore-keys: vcpkg-${{ runner.os }}-${{ runner.arch }}- + if: ${{ runner.os == 'macOS' }} diff --git a/Makefile b/Makefile index 2ac56254..33eb855f 100644 --- a/Makefile +++ b/Makefile @@ -161,7 +161,7 @@ dependencies-debian: ## install dependencies for linux apt-get install -y automake bison cmake curl flex ninja-build tar unzip zip dependencies-fedora: ## install dependencies for linux - yum install -y automake bison cmake curl flex perl-IPC-Cmd tar unzip zip + yum install -y automake bison ccache cmake curl flex perl-IPC-Cmd tar unzip zip dependencies-vcpkg: ## install dependnecies via vcpkg cd vcpkg && ./bootstrap-vcpkg.sh && ./vcpkg install