Skip to content

Commit 29339f2

Browse files
mbrossardmathias-arm
authored andcommitted
Github Actions: Fix ccache
1 parent 6fb361e commit 29339f2

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

.github/workflows/linux.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,30 +45,33 @@ jobs:
4545
- name: Install dependencies
4646
run: |
4747
sudo apt install -y ccache ninja-build
48-
export PATH=/usr/lib/ccache:${{ runner.temp }}/arm-gcc/bin/:/home/runner/.local/bin:$PATH
49-
for i in ${{ runner.temp }}/arm-gcc/bin/* ; do sudo ln -s /usr/bin/ccache /usr/lib/ccache/$(basename $i); done
50-
ccache --set-config=cache_dir="$GITHUB_WORKSPACE"
51-
ccache --set-config=cache_dir="$GITHUB_WORKSPACE/.ccache"
52-
ccache --set-config=max_size=2Gi
53-
ccache -z -s
48+
export PATH="/usr/lib/ccache:$ARM_NONE_EABI_GCC_PATH:/home/runner/.local/bin:$PATH"
49+
for i in "$ARM_NONE_EABI_GCC_PATH/"* ; do sudo ln -s /usr/bin/ccache /usr/lib/ccache/$(basename $i); done
5450
arm-none-eabi-gcc -v | tee log.txt
55-
(git status; git log -1 )>> log.txt
51+
(git status; git log -1)>> log.txt
5652
5753
- name: Cache CCache
5854
id: ccache
5955
uses: actions/cache@v3
6056
with:
6157
path: .ccache
62-
key: ${{ runner.os }}-ccache-${{ hashFiles('log.txt') }}
63-
restore-keys: ${{ runner.os }}-ccache-
58+
key: ${{ runner.os }}-gcc-${{ matrix.gcc }}-${{ hashFiles('log.txt') }}
59+
restore-keys: |
60+
${{ runner.os }}-gcc-${{ matrix.gcc }}-
61+
62+
- name: Configure CCache
63+
run: |
64+
ccache --set-config=cache_dir="$GITHUB_WORKSPACE/.ccache"
65+
ccache --set-config=max_size=2Gi
66+
ccache -z -s
6467
6568
- name: Compile
6669
run: |
67-
export PATH="/usr/lib/ccache:${{ runner.temp }}/arm-gcc/bin/:/home/runner/.local/bin:$PATH"
70+
export PATH="/usr/lib/ccache:$ARM_NONE_EABI_GCC_PATH:/home/runner/.local/bin:$PATH"
6871
python tools/progen_compile.py --release --parallel -v
69-
(ls -lR firmware_*; ccache -s; arm-none-eabi-gcc -v) | tee log.txt
7072
mkdir bootloaders
7173
cp projectfiles/make_gcc_arm/*_bl/build/*_crc.{bin,hex} bootloaders
74+
(ls -lR firmware_*; ccache -s; arm-none-eabi-gcc -v) | tee log.txt
7275
7376
- name: Upload test artifacts
7477
uses: actions/upload-artifact@v3

0 commit comments

Comments
 (0)