Skip to content

Commit

Permalink
fixup again
Browse files Browse the repository at this point in the history
  • Loading branch information
mwestphal committed Aug 27, 2024
1 parent 974dcb6 commit 7f920ba
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 21 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
12 changes: 2 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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:
Expand Down
11 changes: 0 additions & 11 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7f920ba

Please sign in to comment.