diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d231f8..5829bad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,6 +21,7 @@ jobs: os: [ubuntu-latest, windows-latest, macos-13] runs-on: ${{matrix.os}} + container: ${{ matrix.os == 'ubuntu-latest' && 'ghcr.io/f3d-app/f3d-superbuild-ci' || null }} steps: diff --git a/README.md b/README.md index 9d039c6..5e30145 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,10 @@ A github action to install and setup sccache to speed up your builds -It installs (on Linux using `cargo`, on Windows using `choco` and on MacOS using `brew`), recover a cached sccache cache using the github cache action +It installs (on Windows using `choco` and on MacOS using `brew`), recover a cached sccache cache using the github cache action then setup and run a sccache server. +On Linux, it assumes sccache is available. Example usage: @@ -15,15 +16,6 @@ Example usage: key: MyKey-0 ``` -On Linux, it is possible to control if sccache should be installed, as it could already be available in the image you are using - -``` - - name: Install and setup sccache - uses: f3d-app/sccache-setup-action@v1 - with: - key: MyKey-0 - linux_install: false -``` Then during the configuration of your build, add sccache as a launcher, eg, for CMake: diff --git a/action.yml b/action.yml index 8d763a9..35d445d 100644 --- a/action.yml +++ b/action.yml @@ -7,22 +7,11 @@ inputs: key: description: 'Cache key to differentiate between caches' required: true - install_linux: - description: 'Install sccache on linux' - required: false - default: 'true' runs: using: "composite" steps: - - name: Install sccache Linux - if: | - runner.os == 'Linux' && - ${{ inputs.install_linux == 'true' }} - shell: cmd - run: cargo install sccache - - name: Install sccache Windows if: runner.os == 'Windows' shell: cmd